Sync with portage [Wed Dec 22 08:32:09 MSK 2021].

2 years ago · 25337e00e5
parent 156f5a6bf3
commit 25337e00e5
234 changed files with 2145 additions and 1793 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1 +1 @@
-DIST exo-1.49.1.tar.gz 5560772 BLAKE2B 79856f48cada0edb0b36ce95993ed1abfb193efd0bf484fd2ea538bc0b9da84406564d4f7b7896a1f6d1ee09606a0baa2efc1fa417b7935ff4762c536229bd7c SHA512 f52e39c51d97cf4026f0788aa8d15f19251a41fa210c6728bc79d022c9fe64346fd4bae35c8c7fbde2227285fc1abf949d785c7cef451f975d3dd61e5830f854
+DIST exo-1.49.2.tar.gz 5560650 BLAKE2B 1fe332c26f39c792aa1c49f324ebd898d8481edc846356968adfeba6ccf807e5d4d169be6ed68f990adbb8f9f833fc68dae8236a8b0ea2c75ca7750517ba5530 SHA512 57a4c0f6b077526ee165cf0b8a7d38a0dbede3a10d5b78ec938c8e3fdd60623fda5ba4d795def5ef81d7d917910ab21999c8c8d4c9ef49a07508375d50eb6d4f
--- a/app-admin/exo/exo-1.49.2.ebuild
+++ b/app-admin/exo/exo-1.49.2.ebuild
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@ -1,2 +1,3 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
+DIST zstd-1.5.1.tar.gz 1948539 BLAKE2B 2f82fb7872c49c41c8ccae17e343825dabceae3070266e49468c2019a1324758b825d7fc1bc3b62602b4d726538260258dc9134fa81d3c5e5085a8a1b531a8c5 SHA512 ed8ea0143b7bbd85afdcc8f95d44589a0903cff8375059836ebe577cc4b3ea49c0c756db6a3649655e478377f48b3120ef87dc768fd449bd4bfac786209bfd31
--- a/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
+++ b/app-arch/zstd/files/zstd-1.5.1-respect-CFLAGS.patch
@ -0,0 +1,11 @@
+--- a/lib/libzstd.mk
+++ b/lib/libzstd.mk
+@@ -78,8 +78,6 @@ else
+ endif
+   CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
+             -DDYNAMIC_BMI2=0 -DNDEBUG
+-else
+-  CFLAGS += -O3
+ endif
+ 
+ DEBUGLEVEL ?= 0
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@ -30,6 +30,7 @@ mymake() {
 		AR="$(tc-getAR)" \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
 		"${@}"
 }

--- a/app-arch/zstd/zstd-1.5.1.ebuild
+++ b/app-arch/zstd/zstd-1.5.1.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-respect-CFLAGS.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		V=1 \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gvim/gvim-8.2.3741.ebuild
+++ b/app-editors/gvim/gvim-8.2.3741.ebuild
@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}

--- a/app-editors/nano/nano-5.9.ebuild
+++ b/app-editors/nano/nano-5.9.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
--- a/app-editors/vim-core/vim-core-8.2.3741.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3741.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}

--- a/app-editors/vim/vim-8.2.3741.ebuild
+++ b/app-editors/vim/vim-8.2.3741.ebuild
@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch
+++ b/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch
@ -0,0 +1,76 @@
+commit 118d527f2e4baec5fe8060b22a6212468b8e4d3f
+Author: Michael Tokarev <mjt@tls.msk.ru>
+Date:   Wed Sep 1 16:16:24 2021 +0300
+
+    qemu-sockets: fix unix socket path copy (again)
+    
+    Commit 4cfd970ec188558daa6214f26203fe553fb1e01f added an
+    assert which ensures the path within an address of a unix
+    socket returned from the kernel is at least one byte and
+    does not exceed sun_path buffer. Both of this constraints
+    are wrong:
+    
+    A unix socket can be unnamed, in this case the path is
+    completely empty (not even \0)
+    
+    And some implementations (notable linux) can add extra
+    trailing byte (\0) _after_ the sun_path buffer if we
+    passed buffer larger than it (and we do).
+    
+    So remove the assertion (since it causes real-life breakage)
+    but at the same time fix the usage of sun_path. Namely,
+    we should not access sun_path[0] if kernel did not return
+    it at all (this is the case for unnamed sockets),
+    and use the returned salen when copyig actual path as an
+    upper constraint for the amount of bytes to copy - this
+    will ensure we wont exceed the information provided by
+    the kernel, regardless whenever there is a trailing \0
+    or not. This also helps with unnamed sockets.
+    
+    Note the case of abstract socket, the sun_path is actually
+    a blob and can contain \0 characters, - it should not be
+    passed to g_strndup and the like, it should be accessed by
+    memcpy-like functions.
+    
+    Fixes: 4cfd970ec188558daa6214f26203fe553fb1e01f
+    Fixes: http://bugs.debian.org/993145
+    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
+    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+    CC: qemu-stable@nongnu.org
+
+diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
+index f2f3676d1f..c5043999e9 100644
+--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
+@@ -1345,25 +1345,22 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa,
+     SocketAddress *addr;
+     struct sockaddr_un *su = (struct sockaddr_un *)sa;
+ 
+-    assert(salen >= sizeof(su->sun_family) + 1 &&
+-           salen <= sizeof(struct sockaddr_un));
+-
+     addr = g_new0(SocketAddress, 1);
+     addr->type = SOCKET_ADDRESS_TYPE_UNIX;
+    salen -= offsetof(struct sockaddr_un, sun_path);
+ #ifdef CONFIG_LINUX
+-    if (!su->sun_path[0]) {
+    if (salen > 0 && !su->sun_path[0]) {
+         /* Linux abstract socket */
+-        addr->u.q_unix.path = g_strndup(su->sun_path + 1,
+-                                        salen - sizeof(su->sun_family) - 1);
+        addr->u.q_unix.path = g_strndup(su->sun_path + 1, salen - 1);
+         addr->u.q_unix.has_abstract = true;
+         addr->u.q_unix.abstract = true;
+         addr->u.q_unix.has_tight = true;
+-        addr->u.q_unix.tight = salen < sizeof(*su);
+        addr->u.q_unix.tight = salen < sizeof(su->sun_path);
+         return addr;
+     }
+ #endif
+ 
+-    addr->u.q_unix.path = g_strndup(su->sun_path, sizeof(su->sun_path));
+    addr->u.q_unix.path = g_strndup(su->sun_path, salen);
+     return addr;
+ }
+ #endif /* WIN32 */
--- a/app-emulation/qemu/qemu-6.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-6.1.0-r3.ebuild
@ -277,6 +277,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
 	"${FILESDIR}"/${PN}-6.1.0-strings.patch
+	"${FILESDIR}"/${P}-fix-unix-socket-copy.patch
 	"${FILESDIR}"/${P}-automagic-libbpf.patch
 	"${FILESDIR}"/${P}-data-corruption.patch
 )
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/khard/khard-0.13.0-r1.ebuild
+++ b/app-misc/khard/khard-0.13.0-r1.ebuild
@ -4,7 +4,6 @@
 EAPI=7

 PYTHON_COMPAT=( python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1

 DESCRIPTION="Console CardDAV client"
--- a/app-misc/khard/khard-0.17.0-r1.ebuild
+++ b/app-misc/khard/khard-0.17.0-r1.ebuild
@ -4,7 +4,6 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1

 DESCRIPTION="Console CardDAV client"
--- a/app-misc/siglo/Manifest
+++ b/app-misc/siglo/Manifest
@ -1 +1 @@
-DIST siglo-0.9.5.tar.gz 38574 BLAKE2B e593914ab21deaeaaeddafa59545282dfe737e8aa935a53ada444d504499bc03cd1e17f7dca2813d39d30234504742471c2ba2ed94d603c785f7626fa73561fa SHA512 0ed5f9311c680b377c9233dd7db8b00cea3d376933529dadc46c574e12b33a0b9db1b8e1c66fa60dc088a5d0ebb62ac5c1b1b0b00f0e2143ff0f285980938227
+DIST siglo-0.9.6.tar.gz 38606 BLAKE2B 68a65eaa0a8ba9efdf9c72acc02a9ea41be1d3e05eff50df1a171e01138d421f9e6e75ca385a434883a176f6f82a8ca689ddc2097489997de3798fa042f9c81d SHA512 14b74cb25db1f5676203dbfae8b668888d3cfd493ea53267d8c0956a7e96f1cfe5457b7ce802dadcbe563d6810ac64f8f2cb49f59b579146659af28601d52681
--- a/app-misc/siglo/siglo-0.9.6.ebuild
+++ b/app-misc/siglo/siglo-0.9.6.ebuild
@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="${DEPEND}
+		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/gatt-python[${PYTHON_USEDEP}]
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi

 LICENSE="GPL-2"
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
+++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    LDFLAGS := External_As_List ("LDFLAGS", " ");
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@ -0,0 +1,11 @@
+--- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
+++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
+@@ -128,7 +128,7 @@
+       <host name="^i686.*-linux.*$" />
+     </hosts>
+     <config>
+-   for Object_Lister use ("nm", "-g");
+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
+    package Linker is
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+
+inherit ada multiprocessing
+
+MYP=${P}-${PV}0519-19A34-src
+ID=23a77a37247ff811609e23a0a271f445c299fc8f
+XMLADA=xmlada-${PV}-${PV}0518-19D50-src
+XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
+ADAMIRROR=https://community.download.adacore.com/v1
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${ADA_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-nm.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs ${LDFLAGS} gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@ -28,7 +28,10 @@ DEPEND="${ADA_DEPS}"
 RDEPEND="${DEPEND}"

 REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-nm.patch
+)

 src_prepare() {
 	kb_src=../${GPRCONFIG_KB}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
@ -18,7 +18,7 @@ DEPEND="
 	>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
 	>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
 	dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[${MULTILIB_USEDEP}]
+	<x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@ -437,5 +437,6 @@ DIST rqlite-6.1.0.tar.gz 380849 BLAKE2B 87f7d0531e3abe4a574672e17921f4a7bec76dee
 DIST rqlite-6.7.0.tar.gz 405614 BLAKE2B 9845acc7310d0c5611b3922215db473f04f0828d7267c6f84607ca7cae744ff8fe0eccd3f4d4d0617e89b0490e00a0136e1959a2ec70a608c05d4af79b05d5e1 SHA512 c0df563216062fae9b2751d9417133fdd5c02834d3b388e3132902a921ed04b9fa43a41d750bd763882bbd0369ba51f454282f071f893a03b02e2f60c6d9494e
 DIST rqlite-6.8.0.tar.gz 405944 BLAKE2B 74b7feae8c26e2cbd3537df1a5de995ed63c403b54d9ceba46f914bb62ae7c486ee0b7b0e8d6ca05518b26d4ce25170c6e6760eade6cecd965ebe91ef2a02f12 SHA512 26648b411ca8a8af436400dfd0d2316fa8a0ac86de1427b4e810d05fa809c3457b7e31f321e8e28840dd671530216b9a2a3e611785d7863f6212ee2bd2b028cb
 DIST rqlite-6.8.1.tar.gz 406206 BLAKE2B edf0450e443c7da683b02bc3eb87e82ee900519a030e1b579e8849b417de006b219df0d322c6efc26ec2f7cb70ecf617d4b1bbe174d42a52d3bb3f7e4cd8356e SHA512 c2015637ee1f2ac1611e2b0ebf1adc44ef7bdc136b0253f99a89e33877851d688b15bda1c5e5d2b4906b8bd987522d5cc91e7b56efb85aeb4215ea3afd6e35ea
+DIST rqlite-6.8.2.tar.gz 407332 BLAKE2B 5fd86cfbdf4332c1845ba7566acfdd642d759fc67020eee6f969265c4c411bda52404482cee653c111444b79ede2325a3e0d388c211e3ad6133c1ab97ba6805f SHA512 34685761ba750182e19b91afb5fcbbf9cca92f0322c36eafcc331603ac6a1b5f23a718c5d1f645caea8a85823c33790cd7de41e6686cee1ed99f7c0f2a3f54f9
 DIST xorm.io%2Fbuilder%2F@v%2Fv0.3.6.mod 146 BLAKE2B 2db3e352ea5e2e318fe56cfa165d5345f4d85f0523ef6cc495c7f4596bedfb4dc3730c1842a62b75e532cb50505db10162dce1dee8ce5860a3e7b17c83a37910 SHA512 05161f20c13095943f26bbddf4e8ecf60a79121edef21567e51366fe13f5ac24ed8a5ff836484a23d27ccc5b5345a780973097218e2fbf43847cdc94d45ab7ec
 DIST xorm.io%2Fcore%2F@v%2Fv0.7.2-0.20190928055935-90aeac8d08eb.mod 193 BLAKE2B ee37149b40933dc6446d105468e577643ff324821320be45bb82bcedc13882e5e1236dd89eaec2d883db33ccc60584dd9a4c5309b60822b778a393897478bb22 SHA512 5af3eed4c6cfb8f258f0fd2e8fc924aa15e16431298e1d79ffc9701fb37b8393dfa4dcf922d8ce704df7dbf6b36684540eb0972da3f13ddc4c5f3bdb07dc7090
--- a/dev-db/rqlite/rqlite-6.8.2.ebuild
+++ b/dev-db/rqlite/rqlite-6.8.2.ebuild
@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=879b004dea0b1dda549b57e1a2531daa6d55d897
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+
+EGO_SUM=(
+"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75"
+"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.9"
+"github.com/armon/go-metrics v0.3.9/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.12.0"
+"github.com/fatih/color v1.12.0/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.5.0/go.mod"
+"github.com/golang/protobuf v1.5.2"
+"github.com/golang/protobuf v1.5.2/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.16.2"
+"github.com/hashicorp/go-hclog v0.16.2/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.1"
+"github.com/hashicorp/go-immutable-radix v1.3.1/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-msgpack v1.1.5"
+"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/raft v1.1.0/go.mod"
+"github.com/hashicorp/raft v1.3.1"
+"github.com/hashicorp/raft v1.3.1/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/labstack/gommon v0.3.0"
+"github.com/labstack/gommon v0.3.0/go.mod"
+"github.com/mattn/go-colorable v0.1.2/go.mod"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-isatty v0.0.14"
+"github.com/mattn/go-isatty v0.0.14/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mkideal/cli v0.2.7"
+"github.com/mkideal/cli v0.2.7/go.mod"
+"github.com/mkideal/expr v0.1.0"
+"github.com/mkideal/expr v0.1.0/go.mod"
+"github.com/mkideal/pkg v0.1.3"
+"github.com/mkideal/pkg v0.1.3/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/pascaldekloe/goe v0.1.0"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/rqlite/go-sqlite3 v1.22.0"
+"github.com/rqlite/go-sqlite3 v1.22.0/go.mod"
+"github.com/rqlite/raft-boltdb v0.0.0-20210909125202-124e0a496d7e"
+"github.com/rqlite/raft-boltdb v0.0.0-20210909125202-124e0a496d7e/go.mod"
+"github.com/rqlite/raft-boltdb v0.0.0-20210909131733-595768e10065"
+"github.com/rqlite/raft-boltdb v0.0.0-20210909131733-595768e10065/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+"github.com/valyala/fasttemplate v1.0.1/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5"
+"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110"
+"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+"golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365"
+"golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b"
+"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"google.golang.org/protobuf v1.26.0/go.mod"
+"google.golang.org/protobuf v1.27.1"
+"google.golang.org/protobuf v1.27.1/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		go install \
+			-ldflags="-X main.version=v${PV}
+				-X main.branch=master
+				-X main.commit=${EGIT_COMMIT}
+				-X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			./cmd/... || die
+}
+
+src_test() {
+	GOBIN="${S}/bin" \
+		go test ./... || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r *.md DOC
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/gmp/gmp-6.2.1-r2.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r2.ebuild
@ -21,7 +21,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-da
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cxx pic static-libs"

 BDEPEND="sys-devel/m4
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"

--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@ -1 +1,2 @@
 DIST satyr-0.38.tar.gz 433626 BLAKE2B 682d28a932758353e986d2906baf294183756d60a063ce03ba79506b58c92e4fc039c2246c0d43910f6d27d62dd674ffd3b772eeb6e8de46d8080735754b3d3a SHA512 09168050ca7bae00fb3d39f23f8c1e0adcf9cc4d3e491aa002bf9a0a7a265df980d12e430ea7f3eaa9010e0432821b106db5ce3b1e8d935d78b1e56d37110051
+DIST satyr-0.39.tar.gz 434581 BLAKE2B 7b4e11d8027877aa3b9e8144f8917f03b489b157c1112794a3c2bea9998a4367a7ec06cdec6c144fd96ecdabc83a85c5fb2644df02d59086ea3a113b1402fabe SHA512 f6d24ae054867ccdbb2dabdd63c6b351f7eec9ffe5426bdeffa86d585a52d13b07dd31e26b7d14e4850a1fdca748b0d5e23bb51fbc2843af79bf306f09d3145f
--- a/dev-libs/satyr/satyr-0.39.ebuild
+++ b/dev-libs/satyr/satyr-0.39.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit autotools multiprocessing python-r1
+
+DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
+HOMEPAGE="https://github.com/abrt/satyr"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/4"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	>=dev-libs/elfutils-0.158
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/nettle:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-util/gperf
+"
+
+src_prepare() {
+	default
+	./gen-version || die # Needs to be run before full autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	use python && python_setup
+
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-rpm
+		$(usex python "--with-python3" "--without-python3")
+	)
+
+	if use python; then
+		python_configure() {
+			econf "${myargs[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	else
+		default
+	fi
+
+}
+
+src_test() {
+	local extra_args
+
+	# In order to pass --jobs to the test runner
+	run_tests() {
+		cd tests || die
+		emake testsuite
+		./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
+
+		# Only run the python bindings tests for other python impls
+		extra_args=('-k' 'python3_bindings.*')
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir run_tests
+	else
+		run_tests SKIP_PYTHON3=yes
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_install() {
+			default
+			python_optimize
+		}
+		python_foreach_impl run_in_build_dir python_install
+	else
+		default
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@ -1 +1,2 @@
 DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
+DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
--- a/dev-python/cachetools/cachetools-5.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-5.0.0.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests pytest
--- a/dev-python/httpx/httpx-0.21.1.ebuild
+++ b/dev-python/httpx/httpx-0.21.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cli"

 RDEPEND="
--- a/dev-python/identify/identify-2.4.0.ebuild
+++ b/dev-python/identify/identify-2.4.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"

 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]"
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@ -1 +1,2 @@
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
+DIST mypy-0.921.tar.gz 2730985 BLAKE2B cfb7b54165b961758891fcf225f1a7d6bd9c6a7b14e6bb6d8adb990ed047bc4983b5e82de6709d3b8db85a3914e1bae2be4fd36e878d37db7387ebe6e81daac1 SHA512 f592d440b45a1bbcab973aeb717ffc805164168f1369793067a46bd2884fedcb9f981bfadd3447c6801120042553a7a7110d8cfc4e1649241d3b8685dffef653
--- a/dev-python/mypy/mypy-0.921.ebuild
+++ b/dev-python/mypy/mypy-0.921.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
+		mypy/test/teststubtest.py
+	)
+
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@ -4,4 +4,5 @@ DIST Nuitka-0.6.18.1.tar.gz 3688411 BLAKE2B 4ddc98cfb34ff825c628200a72c8cb671a10
 DIST Nuitka-0.6.18.2.tar.gz 3690219 BLAKE2B 416e23500ce7739858e6393eef9783a385229509666c8fd814ce9b4110e77d69d2e7167e89d7db262ee98f60b48f43a07ffec76185154dbc50460623ac84e125 SHA512 7fa6cf48843d45b1d7a1cad11934b5cca2288939e07c12e6916b9c4a37e65d785599ada9e0001faa4117c50e4161fb54253fda27f186f5a660f59810b7254658
 DIST Nuitka-0.6.18.3.tar.gz 3690647 BLAKE2B 7ab4fd2b788a63819b3cbd146e8508d781beb14eec3f0fc724fb4eb0e4805fb17917ab685ab2e28ea50d06c4235be1aa05a694b19e1a2cafd8542d8133aa3496 SHA512 b2aa249dff42c17e0f1c6a33e57cb5e40e17f4043c54467af68071e674ccbe01fd446bfce1e4f0488fd0094561c51ed9f1322e73b049ef19c3f2a9d4f0a6fc44
 DIST Nuitka-0.6.18.4.tar.gz 3690751 BLAKE2B 209a7b0d981f9ba777c53b80708e7f5b09e65565246e9d06b7a0ad6155d3cb5b57e2191406e304be585b326a917f8787c4635c326b5e8ad9254d5ade40cf1ec6 SHA512 9cf404e985dcdc11416218e30340c5d52b6a835d1d1a94d9b5cedfcea774abc7ed848a5c4bd5783a9a1898f469e519148ed195945d3d8e7b9043da00ea38c7f0
+DIST Nuitka-0.6.18.5.tar.gz 3692319 BLAKE2B f60d1516cad1f82c75d63164d93072e6841f092e71bdfadfc713ef4d10838d33c786094f8e326c413bd63cdd561ac6af7a265344cafa9ab45eece630e4e0ce24 SHA512 4dcccf492b0858482b62736478aec0566f11fc8c548ca478b6055b12d694ca1736f495e11c6e4240281fbb11685f043393a1db839dae590dee821a98b4712c87
 DIST Nuitka-0.6.18.tar.gz 3687825 BLAKE2B f2c5655c610083065cc205c0a92ff9c57edfc87a479592f435c3dd194e2d6d71ff0ee9866bc97f222b3936190a4420e7d69cf9413b5b2a5e9439448dda82004f SHA512 df4c81d890ce9c5dc24e648f65137d4bb91dcb92917859976a3400ace6c297f985cee4932b50cb3c2aedb2eaa806be7529a98a75a32fe3f59ec718ed3281003b
--- a/dev-python/nuitka/nuitka-0.6.18.5.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.18.5.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@ -1 +1,2 @@
 DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb SHA512 311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
+DIST pyamg-4.2.0.gh.tar.gz 3900381 BLAKE2B df556553f74ebbc3b83d5a9479af25a54a4fd999edeadaeb0951893612abdb7c2aa79909f6eb4196322752ae87c5636e23c8c9b7dcdbb1f8d515651526e8aff4 SHA512 71e8e1937437888fec275e8522a30f9eb35cb79cc07d6da8032b653ed58e086285701ebb40dbe3b9fe82b53dc6e112e18cf62d42b18233326639417cf808b7c1
--- a/dev-python/pyamg/pyamg-4.2.0.ebuild
+++ b/dev-python/pyamg/pyamg-4.2.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://pyamg.org"
+SRC_URI="
+	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+# cannot be enabled by "distutils_enable_tests pytest"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests setup.py
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@ -1 +1,2 @@
 DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
+DIST pyclipper-1.3.0_p2.tar.gz 51079 BLAKE2B e5af84c15a19bf2ac7f0df78d588d34451c6f0a0bc40fa6a28dd8ef5f697e1d62eb4e14ac184e325ce4d6ad1aab23254d6e91857e3a44636a1652f86aa1778e9 SHA512 08b7f8443b0e98ddf7230824a451b0b0023402c4cecb44c1a264e08d204a3da455aef742b2ffcc0acf44a4ec3b864302af0d7a7ec34bb6a2080340b2320797dd
--- a/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@ -1 +1,2 @@
 DIST pymssql-2.2.1.tar.gz 170421 BLAKE2B 0bd57ffef97f6a557bf78056ed0f184c3b5de09fa031f80f1b7420486bb137ba1750c2ac63e89c0476a3b1808e08beb037b2d9c3fce89bce98a266626222b5c7 SHA512 d44fbe506d7daf3b5fc1dfa20b99814aa3ed025cf8e4e14097f53014bc21918e0969e15149fa93c39367a06567502be08bb673e30ebdf87d6fc2c30b01216b7c
+DIST pymssql-2.2.3.tar.gz 170134 BLAKE2B ed7d6d289b67c5ed76d737d4aec3a6731a94a2cc6bed445e526d62c4f7e9e26fe0e443846727895dd9fc396678d3ee99f021b2b365df14680817b8b8c130e5fa SHA512 10b9b976c7bfaa4c8433e08d256a580354181d41b08b1ced2648f8b4f864d1c83ee46a2d240f394d2c87cd4b494ccd51c0adf923e88de41c4cab30f2a0bae2d9
--- a/dev-python/pymssql/pymssql-2.2.3.ebuild
+++ b/dev-python/pymssql/pymssql-2.2.3.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple MSSQL python extension module"
+HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+# tests need a running instance of freetds
+RESTRICT="test"
+
+RDEPEND=">=dev-db/freetds-0.63[mssql]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	# https://github.com/pymssql/pymssql/pull/708
+	"${FILESDIR}"/${PN}-2.2.1-clock_gettime.patch
+)
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export LINK_FREETDS_STATICALLY=no
+}
--- a/dev-python/rich/rich-10.16.1.ebuild
+++ b/dev-python/rich/rich-10.16.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"

 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
--- a/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
@ -21,3 +21,9 @@ KEYWORDS="~amd64"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"

 distutils_enable_tests pytest
+
+python_install() {
+	# Avoid namespace collision: bug #829747
+	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
+	distutils-r1_python_install
+}
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@ -1 +1,2 @@
+DIST sqlalchemy-rqlite-1.1.1.tar.gz 4285 BLAKE2B e644238621bb0115338e31030895b4da2d250ddc6cdc7dd8bd093862debf5b59d6aa01c10d8ee19387db03420cdef9edb95e1c445e465ac838f43f80b4a23f5d SHA512 5cc37f09eb1e5c7baa370498ba1d07b0255bf18abbcb1b5213eb0acfd83990024f5f5030ed20cac1a2b240c26b799c00f2400fffd79455d14d122b75406614bb
 DIST sqlalchemy-rqlite-1.1.tar.gz 4281 BLAKE2B 09cee627790d15715c0124a1065f5cc2c72820a652a99e4c2088de21c980071f27c451e438e84d4c92222d19b651b0e239fac8280c2bbb33c55e76c9b77868b7 SHA512 da11cadd2b6dd0f3501bdf717ad7dd7552edfcf7f32a57ce09b6dadc7eb7fb31fd92e7143151a3e3b2d5f75793f6e5096d13dbe446cb71cfa901d6ff8d4c6e12
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.1.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A SQLAlchemy dialect for rqlite"
+EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
+HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
+SRC_URI="https://github.com/rqlite/sqlalchemy-rqlite/archive//v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyrqlite[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@ -1 +1,2 @@
 DIST stripe-2.63.0.tar.gz 233693 BLAKE2B 18de5e0a74b241759a7c84203e675159958a77e3ee225ebdfd5ed2d2d633a3b91f5165ac14a164b09e4df81176aafe1727685c4156b5055dc4ea2a44b0af9134 SHA512 fedef25d95e1fe3f9b4fdab37fb4ababc3c0243218da590076942491884b284b07e6bb15e9c85a6871dabffc34c260ec9d9fb80634ab0a368cf312c2324c2bdd
+DIST stripe-2.64.0.tar.gz 234442 BLAKE2B 504e32c19f1a65a39ee709d3abc7211d648c7aaf8493edb4130d49d3fbbebea4ec7d2c116b9b715e9e0d5d383578c477ae0e2cbace51f5b8574d540e9b9238d8 SHA512 5055b5a712c0891f3660d00fe7bb27452cce33aa4a9c70fbd7391dd989d31aeb8d8288c3cdd22747b6fd4c480be17f7ab9428c31ea7d2c674e175e77f4f6a0b7
--- a/dev-python/stripe/stripe-2.64.0.ebuild
+++ b/dev-python/stripe/stripe-2.64.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.115.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
--- a/dev-python/ukkonen/ukkonen-1.0.1.ebuild
+++ b/dev-python/ukkonen/ukkonen-1.0.1.ebuild
@ -16,7 +16,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"

 RDEPEND="
 	$(python_gen_cond_dep '
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/shadowman/shadowman-3.ebuild
+++ b/dev-util/shadowman/shadowman-3.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""

 RDEPEND="app-admin/eselect"
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@ -1,3 +1,4 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.tar.gz 2592 BLAKE2B 205309c4057094301e3469471b0f2da06a6cdf6f36b430b636f5341acde98ae999a537ca3a815a257fd9e3abde8f30bffb9a78f38926224eea3ec29d92548f2b SHA512 d314227588dac2f51b1d6946bac29501607b3e4fa6c3394b4bf56576453d6e6aa5a76fb2b576e216d5e62dabd8994418f11838d95bd90f134d261223fab04dd8
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.tar.gz 2595 BLAKE2B c15c74cd534e571585b1129216fe644d7c8c2b78cf360d26ac48cf1773e3b69e97c3889e13f39355c24b2066168f9cdd2a6e49f830c20f1f6f853aecba6b0ebe SHA512 b3dfa72863972af9ada7803aeff409139708840b795842c32ce6b07cea21e472c06c4ec86eb141b0fd89a31912971d3b97fd96ee4e3d8bc63928f551bf7c9836
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.tar.gz 2609 BLAKE2B 17b75fab4c2c01635ef578444ab2d17ef19abad4fe9ef92ac46ea00e6ee7fa5138364e950e75b7ed581249c650e745fb7cb6adfa18a85a42cbba2d9a7d62555e SHA512 ceaf49c034d90d30534b36a0bd47b18e492a052724820887e284f4e5fe7b7faac24baa19581d113f176ce13082ec080de5562555dc2b65481b187543a60da9cc
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Control the blur effect on gnome-shell lock screen"
+HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
+COMMIT="0223e85a5045e9589cb8186376d9258e845789bd"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+S="${WORKDIR}/${PN/gnome-shell-extension-/}-${COMMIT}"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf LICENSE README.md schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@ -1,2 +1,3 @@
 DIST ding-0.20.0.tar.xz 82000 BLAKE2B 56bdd067985281daa836b34b2969a487314e056f0eb2d60014122f4a3ee8eff159948c4b6cce20b327e7189d88a3cc0311720171f7b407b6b82928b4c1a03cfc SHA512 71cef5993c177f393c77889676b5e593de9beec936f42dbc4d5cac0f415706517598f73fc6aee0a0786eb77f3140852b791cac9a2dd5d01545ba8955a02f4a9c
 DIST ding-0.24.0.tar.xz 101020 BLAKE2B a0f6b276cf41113dbee92ee6e34da3ffbf8f614765874b1185c226ddd350a2b63f369bdb40f71677444694a4083b34765f63eda09761bd3690355d5df6f97173 SHA512 0d066abb3e25cc2dacf593a1f05b14937394a89254bc541311c32f5206782e1d80be82cd1eee567809aee9bc0e3e80206eeae81119e72d444b965a2daf341493
+DIST ding-33.0.tar.xz 106484 BLAKE2B ca1126eb61bc41bbe50938c17ffa8611886aa4656902969270e00fd1e783497bc47f16215d641f74f96cb21763dff134508304e13063bf8cbaea2e3ae584a1c0 SHA512 27bccb7fbea8044fadd9c9732a0f557424af30a3b8d88aa3fe5354ce507f2ae4219fce785ff31dd5f102db1cdd9ced25f733a5a0c5cb39b453e9fcede6815734
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils meson
+
+MY_PN="ding"
+MY_P="${MY_PN}-${PV}"
+COMMIT="af3dc1568f069d145722920017474829"
+
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="ding@rastersoft.com"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8
 LUA_COMPAT=( lua5-{1..3} )

 inherit autotools git-r3 lua-single xdg
@ -15,15 +15,14 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel jpeg lcms lirc lua map nls pdf tiff xmp"

 RDEPEND="
 	virtual/libintl
+	x11-libs/gtk+:3
 	doc? ( app-text/gnome-doc-utils )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	gpu-accel? ( media-libs/clutter-gtk )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
@ -41,7 +40,6 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"

 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"

 src_prepare() {
@ -56,10 +54,10 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-gtk3
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
 		$(use_enable gpu-accel)
-		$(use_enable gtk3)
 		$(use_enable jpeg)
 		$(use_enable lcms)
 		$(use_enable lua)
--- a/media-gfx/ueberzug/Manifest
+++ b/media-gfx/ueberzug/Manifest
@ -0,0 +1 @@
+DIST ueberzug-18.1.9.tar.gz 36411 BLAKE2B 96a925cc2212512dcbf05aa47015c2611f9f36bcf3dcf65d62dc6212c567165faeb798abff55b092f174fd57ff5740734dde74006af8cd7e974598813c8c3adb SHA512 ac28081a26ad025f8caf34d694c0b56efccaac376d7cd181ab7df3f3b435fd521a263defcd749bd3b2fff62cc3139e26054cccfe0fc76bd9cd2ccaaf34a7e0ed
--- a/media-gfx/ueberzug/metadata.xml
+++ b/media-gfx/ueberzug/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seebye/ueberzug</remote-id>
+		<remote-id type="pypi">ueberzug</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/media-gfx/ueberzug/ueberzug-18.1.9.ebuild
+++ b/media-gfx/ueberzug/ueberzug-18.1.9.ebuild
@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Command line util to draw images on terminals by using child windows"
+HOMEPAGE="https://github.com/seebye/ueberzug/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto"
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@ -1,2 +1,3 @@
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
+DIST libwebp-1.2.1.tar.gz 4100806 BLAKE2B 6bbc6dd1a3ec094a6ad0045fd483bcce055c5f3dd15022595de090c4719e5b7bfec60818a8c88886ab2546325a515526d750c9fd31017278ac6d747218570f5e SHA512 5208ac9532c89ea9fec01122cb307afacdbf5c501ed1c6056e9ffc98e2a3386e637224e0301da88ae3a32aa0c210364e1e4eac79487e465ef9e54eb9b1af80aa
--- a/media-libs/libwebp/libwebp-1.2.1.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+	jpeg? ( virtual/jpeg:0= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Fix libtool relinking, bug 499270.
+	#elibtoolize
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local args=(
+		--enable-libwebpmux
+		--enable-libwebpdemux
+		--enable-libwebpdecoder
+		$(use_enable static-libs static)
+		$(use_enable swap-16bit-csp)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable opengl gl)
+		$(use_enable tiff)
+
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
+		$(use_enable cpu_flags_arm_neon neon)
+
+		# Only used for gif2webp binary wrt #486646
+		$(multilib_native_use_enable gif)
+	)
+
+	ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+	dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
+++ b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
@ -0,0 +1,10 @@
+https://bugs.gentoo.org/763612
+--- a/timidity/Makefile.am
+++ b/timidity/Makefile.am
+@@ -480,3 +480,6 @@ $(top_builddir)/utils/libutils.a:
+ 
+ objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES)
+ 	@:
+
+# Prevent .symver mixup with buggy alsa headers (global asm vs. LTO partitions)
+alsa_a.$(OBJEXT): CFLAGS += -fno-lto
--- a/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r2.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit autotools desktop elisp-common systemd toolchain-funcs xdg
+inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg

 MY_PV="${PV/_/-}"
 MY_P="TiMidity++-${MY_PV}"
@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X Xaw3d"

 REQUIRED_USE="tk? ( X )"

@ -36,8 +36,9 @@ DEPEND="
 	vorbis? ( media-libs/libvorbis )
 	X? (
 		media-libs/libpng:0=
-		x11-libs/libXaw
 		x11-libs/libXext
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
 	)
 "

@ -63,10 +64,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
 	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
 	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
+	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
 )

 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }

@ -74,6 +79,21 @@ src_configure() {
 	export EXTRACFLAGS="${CFLAGS}" #385817

 	local audios
+	# List by preference
+	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
+
+	# configure workarounds: configure.in here is written for an old version
+	# of autoconf and upstream seems quite dead.
+	#
+	# 1. Avoid janky configure test breaking
+	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
+	# ./configure: 7995: test: =: unexpected operator```
+	export ac_cv_header_sys_time_h=yes
+	#
+	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
+	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
+	append-cppflags -DSTDC_HEADERS
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"
@ -95,6 +115,7 @@ src_configure() {
 		$(use_enable gtk)
 		$(use_enable tk tcltk)
 		$(use_enable motif)
+		$(use_with Xaw3d xawlib ${xaw_provider})
 	)

 	use flac && audios+=",flac"
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 21 Dec 2021 13:39:14 +0000
+Wed, 22 Dec 2021 05:09:11 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 21 Dec 2021 13:39:14 +0000
+Wed, 22 Dec 2021 05:09:11 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
--- a/metadata/md5-cache/app-admin/exo-1.49.2
+++ b/metadata/md5-cache/app-admin/exo-1.49.2
@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.49.1.tar.gz -> exo-1.49.1.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.49.2.tar.gz -> exo-1.49.2.tar.gz
 _md5_=a638813d2b712f85d21a976d47d1d5b9
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
--- a/metadata/md5-cache/app-arch/zstd-1.5.0
+++ b/metadata/md5-cache/app-arch/zstd-1.5.0
@ -10,4 +10,4 @@ RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2fa3d0f0bde68943ffa0485e635075ac
+_md5_=956438ebf28efac416db8c6de09d756e
--- a/metadata/md5-cache/app-arch/zstd-1.5.1
+++ b/metadata/md5-cache/app-arch/zstd-1.5.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+DESCRIPTION=zstd fast compression library
+EAPI=7
+HOMEPAGE=https://facebook.github.io/zstd/
+IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.5.1.tar.gz -> zstd-1.5.1.tar.gz
+_eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=60e55768d4d22d609b443fca80778205
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
--- a/metadata/md5-cache/app-editors/gvim-8.2.3741
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3741
@ -5,7 +5,7 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.2.3741 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	prefix	d04f14b297013ad1410550c0757f14f8	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ffe9efb8b305d7a2359b73e3527039f8
+_md5_=7fcfe779aa31bf2b33c3d8bc0f342285
--- a/metadata/md5-cache/app-editors/nano-5.9
+++ b/metadata/md5-cache/app-editors/nano-5.9
@ -5,11 +5,11 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=8
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
 REQUIRED_USE=magic? ( !minimal )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v5/nano-5.9.tar.gz
 _eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=2d45fbd929628d507a60df136c5f723e
+_md5_=1dd7679362ee1cc6e5a9376fa55a9644
--- a/metadata/md5-cache/app-editors/vim-8.2.3741
+++ b/metadata/md5-cache/app-editors/vim-8.2.3741
@ -5,11 +5,11 @@ DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.3741 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=39a8f24ef48779b36c4af96af171930c
+_md5_=42c892c9b63a27e7304aeb6008bfcaa8
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3741
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3741
@ -4,11 +4,11 @@ DESCRIPTION=vim and gvim shared files
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=nls acl minimal
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=39a36ea29b633db9b18fbc1517e1f540
+_md5_=5d2a86c9468b69ea0cfda2ede2f21695
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
--- a/metadata/md5-cache/app-emulation/qemu-6.1.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-6.1.0-r3
@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-6.1.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	ac252c3cc67b265cd7ea456f8d58e150	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1cf7a300798d4984df1c44a4ba384a49
+_md5_=cbdb08a91b95975f58496546021202a4
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
--- a/metadata/md5-cache/app-misc/khard-0.13.0-r1
+++ b/metadata/md5-cache/app-misc/khard-0.13.0-r1
@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/scheibler/khard
 IUSE=test python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?]
+RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?] dev-python/configobj[python_targets_python3_8(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?] dev-python/unidecode[python_targets_python3_8(-)?] >dev-python/vobject-0.9.3[python_targets_python3_8(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=aa355425c2faf974137ea534b6822b60
+_md5_=bb008fc58c0da9ab28e12ee952ddc05e
--- a/metadata/md5-cache/app-misc/khard-0.17.0-r1
+++ b/metadata/md5-cache/app-misc/khard-0.17.0-r1
@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/scheibler/khard
 IUSE=test python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=dev-python/atomicwrites[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/configobj[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ruamel-yaml-clib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/unidecode[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.17.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dcc1f0a909f65dd9928f0ba21a6576be
+_md5_=37f4e7d21d4c2d78720c10cdad3e5e35
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST ueberzug-18.1.9.tar.gz 36411 BLAKE2B 96a925cc2212512dcbf05aa47015c2611f9f36bcf3dcf65d62dc6212c567165faeb798abff55b092f174fd57ff5740734dde74006af8cd7e974598813c8c3adb SHA512 ac28081a26ad025f8caf34d694c0b56efccaac376d7cd181ab7df3f3b435fd521a263defcd749bd3b2fff62cc3139e26054cccfe0fc76bd9cd2ccaaf34a7e0ed`