Merge updates from master

dev-python/bitbox02/Manifest

@@ -1 +1 @@
-DIST bitbox02-5.1.0.tar.gz 51297 BLAKE2B 8450cbc4b040cc5b9d9923cff5c2f07e6819032a9fe1b54a108b6bc7a1571535c0930ec8f63a2c13c9abe098d7ba1c6c3f0e138caf1220ab484248cf164a18d4 SHA512 2088d8a93172a5d8a233c1dd0b73d08182d9828f7a799273cae3665b49751edd98660f305c3e8dad0df10300f2ebe38a1233498fe43ee40647a2b0a242bb2096
+DIST bitbox02-5.2.0.tar.gz 53182 BLAKE2B 6794c5c6c8b269316f6ec851b0dfa3646a39bd53e5be8e1364f4e2d8706ff545f43793734cd96339f6761120f3ceb813c871c6e7b847439c2669cc2a4bf89970 SHA512 8c804c3ad09308f599cc45ba62a9db43e16f5f4a5a7de848b5e67f8f8f224832792da038ccdb7f91a4fac159c774080df3b44c9ab21ff9525cf9dec231d8ec3f

dev-python/bitbox02/bitbox02-5.2.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE=""
 
 RDEPEND="
 	>=dev-python/base58-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.14.0[${PYTHON_USEDEP}]
 	>=dev-python/hidapi-0.7.99[${PYTHON_USEDEP}]
 	>=dev-python/noiseprotocol-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/protobuf-python-3.7.0[${PYTHON_USEDEP}]

dev-scheme/gerbil/Manifest

@@ -0,0 +1 @@
+DIST gerbil-0.16.tar.gz 1715765 BLAKE2B 74cd501b19c8f124f9478c73080e92c2ba0bf92e8cb9faa4cba492b2def8a61633897b67def4200e53962ccf22287f58cf7fdd33604104acc80bde12dd58b07c SHA512 46782b4b71a3b437501b825f2f164e53b285d3a4cdba8f04485edaaa589d8500535c06a47a1464fc537ab7546413dde37c8d6a16a5e076a99ccf255905ed105d

dev-scheme/gerbil/files/70gerbil-gentoo.el

@@ -0,0 +1,6 @@
+;;; gerbil site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'gerbil-mode "gerbil-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.ss\\'" . gerbil-mode))

dev-scheme/gerbil/files/gerbil_home.sh

@@ -0,0 +1,6 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+
+GERBIL_HOME="${EPREFIX}/usr/share/gerbil"
+export GERBIL_HOME

dev-scheme/gerbil/gerbil-0.16.ebuild

@@ -0,0 +1,118 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common toolchain-funcs wrapper
+
+DESCRIPTION="Dialect of Scheme designed for Systems Programming"
+HOMEPAGE="
+	https://cons.io/
+	https://github.com/vyzo/gerbil
+"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vyzo/${PN}.git"
+else
+	SRC_URI="https://github.com/vyzo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+IUSE="emacs leveldb lmdb mysql +sqlite +xml yaml +zlib"
+
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="
+	dev-scheme/gambit
+	leveldb? ( dev-libs/leveldb )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( dev-db/mariadb:* )
+	sqlite? ( dev-db/sqlite )
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="70${PN}-gentoo.el"
+
+src_configure() {
+	# Just to be safe, because './configure --help' says:
+	# "Set default GERBIL_HOME (environment variable still overrides)"
+	unset GERBIL_HOME
+
+	local myconf=(
+		$(use_enable leveldb)
+		$(use_enable lmdb)
+		$(use_enable mysql)
+		$(use_enable xml libxml)
+		$(use_enable yaml libyaml)
+		$(usex sqlite '' '--disable-sqlite')
+		$(usex zlib '' '--disable-zlib')
+		--prefix="${D}/usr/share/${PN}"
+	)
+	# This is not a standard 'configure' script!
+	gsi ./configure "${myconf[@]}" \
+		|| die "Failed to configure using the 'configure' script"
+}
+
+src_compile() {
+	# Verbose build process
+	GAMBCOMP_VERBOSE="yes"
+	export GAMBCOMP_VERBOSE
+
+	# The 'build.sh' script uses environment variables that are exported
+	# by portage, ie.: CFLAGS, LDFLAGS, ...
+	sh ./build.sh \
+		|| die "Failed to compile using the 'build.sh' script"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${PN}" \
+		|| die "Failed to make ${D}/usr/share/${PN} directory"
+	gsi ./install \
+		|| die "Failed to install using the 'install' script"
+
+	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" \
+		|| die "Failed to fix the 'gxc' executable script"
+
+	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" \
+		|| die "Failed to fix '/usr/share/emacs' install path"
+	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" \
+		|| die "Failed to fix '/usr/share/gerbil/TAGS' install path"
+
+	# Compile the 'gerbil-mode.el'
+	if use emacs; then
+		pushd "${D}/usr/share/emacs/site-lisp/gerbil" || die
+		elisp-compile *.el || die "Failed to compile elisp files"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		popd || die
+	fi
+
+	# Create wrappers for gerbil executables in GERBIL_HOME (/usr/share/gerbil)
+	pushd "${D}/usr/share/${PN}/bin" || die
+	local gx_bin
+	for gx_bin in *; do
+		make_wrapper "${gx_bin}" "env GERBIL_HOME=\"${EPREFIX}/usr/share/${PN}\" ${EPREFIX}/usr/share/${PN}/bin/${gx_bin}"
+	done
+	popd || die
+
+	# Without this the programs compiled with gxc will break!
+	# FIXME: Patch gerbil to compile with te correct 'GERBIL_HOME'?
+	insinto "/etc/profile.d"
+	doins "${FILESDIR}/gerbil_home.sh"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

dev-scheme/gerbil/gerbil-9999.ebuild

@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common toolchain-funcs wrapper
+
+DESCRIPTION="Dialect of Scheme designed for Systems Programming"
+HOMEPAGE="
+	https://cons.io/
+	https://github.com/vyzo/gerbil
+"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vyzo/${PN}.git"
+else
+	SRC_URI="https://github.com/vyzo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 LGPL-2.1"
+SLOT="0"
+IUSE="emacs leveldb lmdb mysql +sqlite +xml yaml +zlib"
+
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="
+	dev-scheme/gambit
+	leveldb? ( dev-libs/leveldb )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( dev-db/mariadb:* )
+	sqlite? ( dev-db/sqlite )
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	sed -i "s|gcc|$(tc-getCC)|g" ./build.sh || die "Failed to fix CC setting"
+	sed -i "s|-O2|${CFLAGS}|g" ./build.sh || die "Failed to fix CFLAGS setting"
+}
+
+src_configure() {
+	# Just to be safe, because './configure --help' says:
+	# "Set default GERBIL_HOME (environment variable still overrides)"
+	unset GERBIL_HOME
+
+	local myconf=(
+		$(use_enable leveldb)
+		$(use_enable lmdb)
+		$(use_enable mysql)
+		$(use_enable xml libxml)
+		$(use_enable yaml libyaml)
+		$(usex sqlite '' '--disable-sqlite')
+		$(usex zlib '' '--disable-zlib')
+		--prefix="${D}/usr/share/${PN}"
+	)
+	# This is not a standard 'configure' script!
+	gsi ./configure "${myconf[@]}" \
+		|| die "Failed to configure using the 'configure' script"
+}
+
+src_compile() {
+	# Verbose build process
+	GAMBCOMP_VERBOSE="yes"
+	export GAMBCOMP_VERBOSE
+
+	# The 'build.sh' script uses environment variables that are exported
+	# by portage, ie.: CFLAGS, LDFLAGS, ...
+	sh ./build.sh \
+		|| die "Failed to compile using the 'build.sh' script"
+}
+
+src_install() {
+	mkdir -p "${D}/usr/share/${PN}" \
+		|| die "Failed to make ${D}/usr/share/${PN} directory"
+	gsi ./install \
+		|| die "Failed to install using the 'install' script"
+
+	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" \
+		|| die "Failed to fix the 'gxc' executable script"
+
+	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" \
+		|| die "Failed to fix '/usr/share/emacs' install path"
+	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" \
+		|| die "Failed to fix '/usr/share/gerbil/TAGS' install path"
+
+	# Compile the 'gerbil-mode.el'
+	if use emacs; then
+		pushd "${D}/usr/share/emacs/site-lisp/gerbil" || die
+		elisp-compile *.el || die "Failed to compile elisp files"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		popd || die
+	fi
+
+	# Create wrappers for gerbil executables in GERBIL_HOME (/usr/share/gerbil)
+	pushd "${D}/usr/share/${PN}/bin" || die
+	local gx_bin
+	for gx_bin in *; do
+		make_wrapper "${gx_bin}" "env GERBIL_HOME=\"${EPREFIX}/usr/share/${PN}\" ${EPREFIX}/usr/share/${PN}/bin/${gx_bin}"
+	done
+	popd || die
+
+	# Without this the programs compiled with gxc will break!
+	# FIXME: Patch gerbil to compile with te correct 'GERBIL_HOME'?
+	insinto "/etc/profile.d"
+	doins "${FILESDIR}/gerbil_home.sh"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

dev-scheme/gerbil/metadata.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xgqt@protonmail.com</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<use>
+		<flag name="leveldb">
+			Add support for using dev-libs/leveldb
+		</flag>
+		<flag name="lmdb">
+			Add support for using dev-db/lmdb
+		</flag>
+		<flag name="yaml">
+			Add support for yaml file format
+		</flag>
+	</use>
+	<longdescription lang="en">
+		Gerbil is an opinionated dialect of Scheme designed
+		for Systems Programming, with a state of the art macro
+		and module system on top of the Gambit runtime.
+		The macro system is based on quote-syntax, and provides
+		the full meta-syntactic tower with a native implementation
+		of syntax-case. It also provides a full-blown module system,
+		similar to PLT Scheme’s (Racket) modules. The main difference
+		from Racket is that Gerbil modules are single instantiation,
+		supporting high performance ahead of time compilation
+		and compiled macros.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">vyzo/gerbil</remote-id>
+	</upstream>
+</pkgmetadata>

dev-scheme/guile-colorized/Manifest

@@ -0,0 +1 @@
+DIST guile-colorized-20191205.tar.bz2 15496 BLAKE2B a85fc44c3b6b8433362197a4f1da216ea99793673ee4592e6ea32178d2952d0f43f5a4e79304185d0c67b6dee668bf52d53970df97954a37650cd8b7770e7abd SHA512 4cd9833c70debf0086ba69252e1fb8b9fc33707ec1f3bb6dfb144d5a35db6f38e3af585cbc889936c8ebb38dea0f8808f483bd51ed1722c9b9df857d31a7cec7

dev-scheme/guile-colorized/guile-colorized-20191205.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Colorized REPL for GNU Guile"
+HOMEPAGE="https://gitlab.com/NalaGinrut/guile-colorized/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NalaGinrut/${PN}.git"
+else
+	# Latest release (before this commit from 2019) was in 2015
+	COMMIT_SHA="1625a79f0e31849ebd537e2a58793fb45678c58f"
+	SRC_URI="https://gitlab.com/NalaGinrut/${PN}/-/archive/${COMMIT_SHA}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=dev-scheme/guile-2.0.9
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_install() {
+	einstalldocs
+
+	local loadpath=$(guile -c '(display (string-append (car %load-path) "/ice-9"))')
+	mkdir -p "${D}${loadpath}"
+	emake TARGET="${D}${loadpath}" install
+}

dev-scheme/guile-colorized/guile-colorized-99999999.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Colorized REPL for GNU Guile"
+HOMEPAGE="https://gitlab.com/NalaGinrut/guile-colorized/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NalaGinrut/${PN}.git"
+else
+	# Latest release (before this commit from 2019) was in 2015
+	COMMIT_SHA="1625a79f0e31849ebd537e2a58793fb45678c58f"
+	SRC_URI="https://gitlab.com/NalaGinrut/${PN}/-/archive/${COMMIT_SHA}.tar.bz2 -> ${P}.tar.bz2"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${COMMIT_SHA}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	>=dev-scheme/guile-2.0.9
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_install() {
+	einstalldocs
+
+	local loadpath=$(guile -c '(display (string-append (car %load-path) "/ice-9"))')
+	mkdir -p "${D}${loadpath}"
+	emake TARGET="${D}${loadpath}" install
+}

dev-scheme/guile-colorized/metadata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xgqt@protonmail.com</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<longdescription lang="en">
+		colorized REPL for GNU Guile
+		NOTE: Now guile-colorized only support Guile-2.0.9 or higher!
+	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">NalaGinrut/guile-colorized</remote-id>
+	</upstream>
+</pkgmetadata>

media-video/qliveplayer/Manifest

@@ -1,2 +1,2 @@
-DIST QLivePlayer-3.20.2.tar.gz 638142 BLAKE2B f9b7f6f69a4d751b57441e61b670a909408317801463415c8b0c311766bdbf16913c811e11c7a31096a6609b2e5e6f8ae64688d03d04dd1ebab97ebdf1644e08 SHA512 9ea868c59ff15ee6efa4a9c02578fee628c0f2985203d2696496512f9e1fd05b5d1642d4812711ef3be3843077b6f655288f07d48da7ceb80add20e7442cbf5b
 DIST QLivePlayer-3.21.0.tar.gz 639005 BLAKE2B 254257cbab62b2578be5a2980c95b982b2da9223756a1efaf3098df1a313d4a252aac70bc032bc13f4e6e330e67d3525a6615d61cec494eab3d666b0ccfc3208 SHA512 755d975b37488979c257ecb8473a3702ee20859d1e1c10c42a7077b84e6b9a890dfb5af442c7a4a30c73bf2a088671ec14c1a4a95c849a724cabf88e6a407ec3
+DIST QLivePlayer-3.21.1.tar.gz 639098 BLAKE2B 956edafc652d5124ea14357a8015450c6678d1fa46b9701b5e65e23ca824bcc4e2b2598ff9c5441210afaa32c21c21affb432b323b452053fa5a548816765c56 SHA512 8aca7a62ff4839ff0640b3d982fa6f498996add39d6ed7e4904db2530347c35a56c524cb3c75c85d3de7c635142ff1dc8e3ac69644eef19f4aa55d77a21dd2f1

media-video/qliveplayer/qliveplayer-3.21.0.ebuild

@@ -22,9 +22,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgraphicaleffects-5.12:5
-	>=dev-qt/qtquickcontrols-5.12:5
-	>=dev-qt/qtquickcontrols2-5.12:5
+	>=dev-qt/qtdeclarative-5.12:5
+	>=dev-qt/qtgui-5.12:5
+	>=dev-qt/qtnetwork-5.12:5
+	>=dev-qt/qtwidgets-5.12:5
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -56,5 +57,5 @@ pkg_postinst()
 {
 	xdg_pkg_postinst
 	optfeature "twitch support" "net-misc/streamlink"
-	optfeature "youtube support" "net-misc/streamlink dev-python/protobuf-python"
+	optfeature "youtube support" "dev-python/protobuf-python net-misc/streamlink"
 }

media-video/qliveplayer/qliveplayer-3.21.1.ebuild

@@ -21,10 +21,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgraphicaleffects-5.12:5
-	>=dev-qt/qtquickcontrols-5.12:5
-	>=dev-qt/qtquickcontrols2-5.12:5
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdeclarative-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -56,5 +57,5 @@ pkg_postinst()
 {
 	xdg_pkg_postinst
 	optfeature "twitch support" "net-misc/streamlink"
-	optfeature "youtube support" "net-misc/streamlink dev-python/protobuf-python"
+	optfeature "youtube support" "dev-python/protobuf-python net-misc/streamlink"
 }