gentoo auto-resync : 08:01:2023 - 18:16:34

author: V3n3RiX <venerix@koprulu.sector> 2023-01-08 18:16:35 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-08 18:16:35 +0000
commit: 2237cda0c6b012952e02ec1314e1f48eddf4dab7 (patch)
tree: 0a7ab76265dc441f4b3436f07d019007e6a13237
parent: 6a57f9ee53dc794f3d47ea68f78d6ef76d00af47 (diff)
335 files changed, 1537 insertions, 5007 deletions
diff --git a/Manifest b/Manifest
index 57ad94cc9c9d..7689657c42a3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29782 BLAKE2B ff686a03fd10b052ba9b219bf10492d0abe627321e5a151ce3713765458c670e3f6b29745af4344e48a8b9dd64611c26863865cee05737200c168d3d5655c390 SHA512 56c7b1516a57f14707650143df2dcc2ae56bde7fafdd7b30b48f48d650ddf0fad9b79d2b7fa59b575925d6c7f88fda065318a8c2739f788bada4c1fb47909973
-TIMESTAMP 2023-01-08T11:39:40Z
+MANIFEST Manifest.files.gz 29804 BLAKE2B b9fa50a61e12d0a78aa81862da85c49489a69a052824081a19797292cea0b0d0e851268d1d7ba4e6f18f4309e0aa223e57a628d9fdb3078a1b0bee9580e5f2ed SHA512 7b23b22f46409e3b5deb346919d444299e69d529d3784f72ee0a22a6cdb5e3e69449eab3e5883905589764c591a01f6814da0842724fa0dd1317db3b3100b243
+TIMESTAMP 2023-01-08T17:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6/91fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBthxAAq9m/thgOtIWe8Arw1OYPhD2lynyehrWuR9PHIy+L4a/0FvVVhdDjbqhf
-gswQgIf0sGPTAQ6aHHsQwWKrAjIs5d18dGVIceGcs4wiYleYn3HZ/TNHWMNEf7um
-YhDAGEZkKHCqya+Nnh3v8Er0+eFPqsKmVxkAxapphqycrnLmbpL9z3+4MEN6YgTv
-Xi7WnOkZ58we5xlE6SGMOX8efo23hTILYk0dXTddw9+k4VJCDO9dmiBUsQgThPgl
-OuvdojictA8UZfnq5AMOaZZLLOWVAhSxWgdejYcENarPPCwpSxW9Ri6tVaCMCuvj
-ClJ+aWTUv/lRuZFovO5iuNm56fb++qol+3aflvS/nk46j4uELyCvI1qlyIqldc05
-pkyhFaGbpx9XCg/+YBho5MLtivnVXn8vgtiQXOUXOxdNXSJo7nZdyRHQDW08AdSQ
-Ec0CkLsMXkfqneJPuVsJ/GTInKMdn/MGkd8w6d8OUlEdNGcf/7yAyrRBuzqtsm62
-cJwTpt/1f7UeZ3PWNOfW9wBP6Jag6VuND8yisN2X1y363QofENeB4PxgfkcKcEZP
-og9QgFKM5st/kb9VdUaNiQQPlC2q/ekDG+SoX4fueRQ+0ejVvIbtSI0prSLke7SD
-IskRCxNbYudJcDEKY0evuBRxM0rU9XiqLLLYTKRFT9mZ7MDFZrI=
-=oaxI
+klAo6A/8CLsdamo+r6H5v1hNzSVGOXydQoqzdBfc/r+EUsOEW2HvJ/1i0gu9ukOl
+gLoxEqqoiK6qF+g1LJ2XIkmXG4GEC7/YChx+zb/3vhfyyIhmdYRLJtu8fBKgwn74
+qlp3PcfDVgVVlXGQXO9rMY7xuh21O/JpIyzOSZBPCr8ZrU9WJiajL7Wr05jDO7u8
+xOo63Mc5uIOYvIGgK9C3AY2CMKBMiEr7XSBOzSKP6vJ7A6+JcqHuYPd2O2y5q1Ny
+Tz3e6br2L8uYFaZCXsWSPDyakt1FraCj65F7ZOF1+sx7HzsZvgC6jV+0iWoSbrdb
+SNaPX7wi2VRVXkJUV/Rk3/lSs6kShmRS2tJZrq7EKmq1vEakhgMCKXacr1Tay96t
+3qhOzZTkPdOGQS/sy+0yy4imBqMXQVStVbZiabs43HW/esrt4ZxtUCKEGHbgrTJD
+hzbqy7VfTEvhM7/+8PQTzAZpYaGoRlSkM0sWtxUBpZQnPsn3ULi2tPtrfFzqoYKB
+64Q6IRPhm1ucjNQNSOBH+m+V05vUxwgr94wf/qg1N4gUP+pwmFHiRKwTs87NaALI
+nv+u/PJCBJg6dDrFUFIbaGj1Ds71kHSqNM+3e9cJKkavGiexxXFFHz1Pezthtfx8
+1HxrtU3paYZIjEugtef8vfvZYwhkwSesDPa/FXm+UFbNDEAOkR0=
+=U1Z7
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1bcddf421578..d5727b8d6dcb 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8debe03fab24..4fe9330080f7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mongosh-bin/Manifest b/app-admin/mongosh-bin/Manifest
index db78dfb82e21..89cd021c5338 100644
--- a/app-admin/mongosh-bin/Manifest
+++ b/app-admin/mongosh-bin/Manifest
@@ -3,5 +3,5 @@ DIST mongosh-1.1.9_x64.tgz 62020005 BLAKE2B 2b634fe864bef24bd93f6676acf57d877d74
 DIST mongosh-1.3.1_arm64.tgz 61196774 BLAKE2B 6d48f06d2378d0d1f46f896b445e4022a5a8c0f7d6b9225dadf909734a721255eb0d4b6daccf52886db07a1f3186125abef10603e4cf91791b4d93c0d6ca2a30 SHA512 46519e1ccda8490ac1336014c17250392402c7497b34fdb4cdefdab322913f740b2699e2f1a94aeee5441157025586900f1ffe3bac40e4eca5e1858cdc2e406b
 DIST mongosh-1.3.1_x64.tgz 62428646 BLAKE2B f92434ff73890ba38498bc51d9a497d7feab240e7bbe380565b1bf54fa58018d24250c70f20f634248b481b5b41d0c4bdea0bf130347a1fdd547cfc7d655de67 SHA512 2650f05f40594736985e11cede4d59dcce0c620654ab7c136084a94b816bafd3d2cc6ab8be05e1c844cad9221f436e9aa2e9e670cbae6505fe6d28c12cf608dd
 EBUILD mongosh-bin-1.1.9.ebuild 866 BLAKE2B 59fc8ec7f482747ed34e3048c68d3d34c0e066812f6de0ca9d9abfd634022851c3b63595e350a44a526a2b82bf239d2b382709dc5b289e13f1a7067bb15ec539 SHA512 e34614f383d72436e41c772d7617c1e20b818e3015c7b282ac3c00b0fe9dc8a63bed0ce1ece6399e2b91cc4ff8ea4d2efe817d672170b7c6efb258343242e83e
-EBUILD mongosh-bin-1.3.1.ebuild 864 BLAKE2B 83ab104b19aed9ff6c6e8d645aa5077f9e5c21c596ef482eb350b27cbc21b12474b5fecf0eb9ebab67a8dfbf56f7fe8f952cd99e4fd512ff4da59ce9a87330e8 SHA512 ee58998a85b19de8cc4fb14f14724328c7851eb0464ae4f034b7057eefaf093186d70941845d8c0852b9f5e0871db01411b072ac4858ec26ab2a7600aab557f3
+EBUILD mongosh-bin-1.3.1.ebuild 863 BLAKE2B 054f45714e3aea5435d71db8d76d72aa3a0e3a2574fbfa3aac847ab132cb33c2cbad94f38cd25e33a448dbbe545b86eda2d6637624f760991767bb5e7347e862 SHA512 6369a03a6607abf65c071d7c8f68ed76fb3acc765559c834aa3b8cb60c99305357c5f9854c9fd297c914aa2732843400e635fc66f10ce8a3a54d2b93d1893b78
 MISC metadata.xml 589 BLAKE2B b1893b4e14b43ba803ce4a673a2550821cc2acacd0fd4e203bfc71522db394778de744ab28de46ae9e3dca3ec346baf751056d18dc43c978aafc860768057133 SHA512 3b74d3554cb6d32ed12b5bed010473b29fa6f2b39d68461b6bcfdac317be8569998e5d7abeaf1c20a34c30dd360da261690164bb22920666758d00494f0aa280
diff --git a/app-admin/mongosh-bin/mongosh-bin-1.3.1.ebuild b/app-admin/mongosh-bin/mongosh-bin-1.3.1.ebuild
index 2466be1376d5..7fc69f5adb4f 100644
--- a/app-admin/mongosh-bin/mongosh-bin-1.3.1.ebuild
+++ b/app-admin/mongosh-bin/mongosh-bin-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="amd64? ( ${SRC_URI_BASE}-x64.tgz -> ${MY_P}_x64.tgz )
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 ISC MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="dev-libs/cyrus-sasl[kerberos]"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0be898a94422..4c1f5e09ed33 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
deleted file mode 100644
index bda84cb2241c..000000000000
--- a/app-editors/elvis/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX elvis-2.2.0-glibc-2.10.patch 1526 BLAKE2B 4c49a42ade8a5bfb4140362d7237fa1e21bf231cc1ebfc038b24181ed5e6f522463ca1111835f90e82e1975484be1637e299257a04f36f16585e0498133d6282 SHA512 2658fc5a6758a0ecab2320a01fcb708d595e304e94609f642e324d6d77a58a13e20560041fdb890f0f91443c5a3c53ccd1eb8f6a7bc47c70f8e910da107b071c
-AUX elvis-2.2.0-interix.patch 297 BLAKE2B be5b6d3ab880254f2fc271b85289ec64f3dc907936a71fc122b5ec37d7377c3d169af3c26b488c2e4bbdaf4562f3237a8850a867c3e67f568cedcc8d1cb604c6 SHA512 7215150c74b96ea441898435c02f342c0fac2e579363be5a95684a49b84e020275b6e9124b8fd449559e1e3217f96901c2887214ee61a4ca8484598a7cd42442
-AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567ab3af899c291d0a06fdba4c567a5169da01ba61a3e4490faaf91a3a74b3bf91750f1426aeecc02452eb1355093e14d973f SHA512 14a2880f9984615f9876973e5eaea54846547d2871b8c2f1417c968e5e92c01612c954d39026671cb29656c4d6fd93d65f1bd6fc6325471346e1f56e3e1b97a3
-DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
-EBUILD elvis-2.2.0-r8.ebuild 2501 BLAKE2B fb3ec68d80771add1fcbec5a80b45a13dd5519f3b8a337aad468884787ffe90418c790c22801960c8c48900df724a2be578f036355b9bb47f075970e127ce818 SHA512 bac51155f85c1588874acf4892a4d457e12d66dc7cb56936fa4c853b338be8b520677b2e8c6be7956d87e73c919c74f82968980374402741632180b4815704c6
-MISC metadata.xml 246 BLAKE2B 410fd0eb2d2b412bb4ca13905fea3351e818dbeed07d7063df2ebfe9000dd45ba7ac827a33c8961913ac567db7caa61646229e43b527edbd704795cc09ba3c94 SHA512 2c66e46cc1cc61356d6784064205b832cd2854c3dbfb6dc79ba55b968d1886e2063a7bdb4b2541651e4f289c09bd344cd4eb7d48b2bda67c955b09f142b63c55
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
deleted file mode 100644
index ded9e0a3c4c4..000000000000
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86 ~ppc-macos ~sparc-solaris"
-IUSE="X doc"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	app-eselect/eselect-vi
-	X? (
-		>=x11-libs/libX11-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXpm-3.5.4.2
-		>=x11-libs/libXft-2.1.8.2
-	)"
-
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/ft2.3-symbol-collision-fix.patch
-	"${FILESDIR}"/${P}-glibc-2.10.patch
-	"${FILESDIR}"/${P}-interix.patch
-)
-
-src_configure() {
-	export CC="$(tc-getCC)"
-	./configure \
-		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${EPREFIX}"/usr/share/elvis \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		|| die
-
-	# Some Makefile fixups (must happen after configure)
-	# Use our CFLAGS
-	sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \
-		die "sed 1 failed"
-
-	# We'll install the man-pages ourselves
-	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
-
-	# Don't try to write to /etc
-	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
-
-	# Use LDFLAGS
-	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
-		die "sed 4 failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	dodir /usr/share/elvis
-	dodir /usr/share/doc/${PF}
-	dodir /etc
-
-	local docdir="${ED}/usr/share/doc/${PF}"
-	if ! use doc; then
-		docdir="${T}/doc-discard"
-	fi
-
-	emake install \
-		PREFIX="${ED}"/usr \
-		BINDIR="${ED}"/usr/bin \
-		DATADIR="${ED}"/usr/share/elvis \
-		DOCDIR="${docdir}"
-
-	# Install the man-pages
-	mv doc/elvis.man doc/elvis.1 || die
-	mv doc/elvtags.man doc/elvtags.1 || die
-	mv doc/ref.man doc/ref.1 || die
-	doman doc/*.1
-
-	# Fixup some READMEs
-	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-		|| die 'sed /etc/elvis/README failed'
-	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-		|| die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}
diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
deleted file mode 100644
index 1a3d1affb303..000000000000
--- a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c
---- elvis-2.2_0.orig/ref.c	2003-10-21 05:32:25.000000000 +0300
-+++ elvis-2.2_0/ref.c	2009-08-05 21:28:30.000000000 +0300
-@@ -42,7 +42,7 @@
- 
- #if USE_PROTOTYPES
- static void usage(char *argv0);
--static char *getline(FILE *fp);
-+static char *get_line(FILE *fp);
- static void store(char *line, char **list);
- static LINECLS classify(char *line, LINECLS prev);
- static void lookup(TAG *tag);
-@@ -171,7 +171,7 @@
- /* This function reads a single line, and replaces the terminating newline with
-  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
-  */
--static char *getline(fp)
-+static char *get_line(fp)
- 	FILE	*fp;
- {
- 	int	ch;
-@@ -348,7 +348,7 @@
- 	}
- 
- 	/* for each line... */
--	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
-+	for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
- 	{
- 		/* is this the tag definition? */
- 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
-@@ -377,7 +377,7 @@
- 			{
- 				if (strchr(line, '(') != NULL)
- 				{
--					while ((line = getline(fp)) != NULL
-+					while ((line = get_line(fp)) != NULL
- 					    && *line
- 					    && ((*line != '#' && *line != '{')
- 						|| line[strlen(line) - 1] == '\\'))
-@@ -387,7 +387,7 @@
- 				}
- 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
- 				{
--					while ((line = getline(fp)) != NULL
-+					while ((line = get_line(fp)) != NULL
- 					    && (lc = classify(line, lc)) == LC_PARTIAL)
- 					{
- 						puts(line);
diff --git a/app-editors/elvis/files/elvis-2.2.0-interix.patch b/app-editors/elvis/files/elvis-2.2.0-interix.patch
deleted file mode 100644
index e16024374716..000000000000
--- a/app-editors/elvis/files/elvis-2.2.0-interix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' elvis-2.2_0.orig/osunix/osblock.c elvis-2.2_0/osunix/osblock.c
---- elvis-2.2_0.orig/osunix/osblock.c	2008-04-03 12:00:26 +0200
-+++ elvis-2.2_0/osunix/osblock.c	2008-04-03 12:01:53 +0200
-@@ -293,5 +293,7 @@
- 		return;
- #endif
- 
-+#ifndef __INTERIX
- 	sync();
-+#endif
- }
diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch
deleted file mode 100644
index aac099e56ef7..000000000000
--- a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags
---- elvis-2.2_0-orig/guix11/tags	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/tags	2007-08-17 12:56:28.000000000 -0700
-@@ -31,7 +31,7 @@
- DEFAULT_TOOLFG	guix11.c	40;"	d	ln:40	file:
- DEFAULT_XENCODING	guix11.c	48;"	d	ln:48	file:
- FT_DEFAULT	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
--FT_FILE	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
-+FT_FILEC	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_LOCKED	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_NUMBER	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
- FT_ONEOF	xdialog.h	10;"	ln:10	enum:X_FIELDTYPE
-diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c
---- elvis-2.2_0-orig/guix11/xdialog.c	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/xdialog.c	2007-08-17 12:56:28.000000000 -0700
-@@ -387,7 +387,7 @@
- 			  case 'o': ft = FT_ONEOF, limit = scan;	break;
- 			  case 'n': ft = FT_NUMBER, limit = scan;	break;
- 			  case 's': ft = FT_STRING;			break;
--			  case 'f': ft = FT_FILE;			break;
-+			  case 'f': ft = FT_FILEC;			break;
- 			  case 'l': ft = FT_LOCKED;			break;
- 			}
- 
-@@ -556,7 +556,7 @@
- 			break;
- 
- 		  case FT_STRING:
--		  case FT_FILE:
-+		  case FT_FILEC:
- 			button = addbutton(dia, "<", 'l', ELVCTRL('L'));
- 			button->y = dia->y0 + dia->rowh * i;
- 			button->x = dia->x0 + 3;
-@@ -1111,7 +1111,7 @@
- 			newvalue = keystring(dia, key);
- 			break;
- 
--		  case FT_FILE:
-+		  case FT_FILEC:
- #ifdef FEATURE_COMPLETE
- 			if (key == '\t')
- 			{
-@@ -1179,7 +1179,7 @@
- 	switch (dia->field[row].ft)
- 	{
- 	  case FT_STRING:
--	  case FT_FILE:
-+	  case FT_FILEC:
- 	  case FT_NUMBER:
- 	  case FT_LOCKED:
- 		drawtext(dia, row);
-@@ -1207,7 +1207,7 @@
- 			break;
- 
- 		  case FT_STRING:
--		  case FT_FILE:
-+		  case FT_FILEC:
- 			if (button->shape == 'l')
- 				if (row == dia->current
- 				    ? dia->shift > 0
-diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h
---- elvis-2.2_0-orig/guix11/xdialog.h	2003-10-20 19:32:26.000000000 -0700
-+++ elvis-2.2_0/guix11/xdialog.h	2007-08-17 12:56:28.000000000 -0700
-@@ -5,7 +5,7 @@
- 	FT_ONEOF,	/* one of a preset list; includes boolean */
- 	FT_NUMBER,	/* numeric field */
- 	FT_STRING,	/* string field */
--	FT_FILE,	/* string field where <Tab> does filename completion */
-+	FT_FILEC,	/* string field where <Tab> does filename completion */
- 	FT_LOCKED	/* non-editable field */
- } X_FIELDTYPE;
- typedef struct
-
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
deleted file mode 100644
index 6be55e0ac363..000000000000
--- a/app-editors/elvis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>vim@gentoo.org</email>
-	<name>Gentoo Vim Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 37675f9ed50c..a496af80a18d 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index e3ee13d9d0ba..50365a0418d6 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,9 @@
 DIST mgorny-dev-scripts-31.tar.gz 11903 BLAKE2B bbe7dc4ab1978485d9c954e5ac0752e3babb3162a20b3c582d92a14cfd20d82f3710f65d34bd15a3b101547f587cf3c8859b066be555ac5b3d55c10ee7f68568 SHA512 a164bb1b75911a4575813720c2dd10b81ca806dafa6eebf71f2f609eee24cd4bbc645eb3f1c8d40eb6031d25b5ea6575fa761f53b5f03d52e0438d6dfd2dc173
 DIST mgorny-dev-scripts-32.tar.gz 11933 BLAKE2B b10333bfc4afe5ecb8faa1ccadb74c476911056ba8d0f7b0113d8ee5453252a20958bc1a08cee42cf48a1f343f64c1ecb80b157efa6f253cdecf16750759f78f SHA512 1043b12f788130e10eae651f80869b9ba4603bb28c7c7bae3fcb790ecb55b36b2d8b8b5597f7bf34053f5a99fc70590fd029a5f65ccc0bd2ba5ae2a93e5f2199
 DIST mgorny-dev-scripts-33.tar.gz 11943 BLAKE2B 8455d90db5ad1358941e4ccdba1b2f7ea8cc766d0789b3ab598e5b4c3d406b0b66c6d24aaa1a33019560b6103bd648aedcce02dad7deb6df4ac789e4937fe7cf SHA512 b4c17cb1c2eeba86a74fbe011e9ad7b06304a7386960032add1b9c1d7e8200b258a8b2239e0450da7c61ce4c8d1a025206b54fc4050cfa8e343590a1d35e3139
+DIST mgorny-dev-scripts-34.tar.gz 11957 BLAKE2B d277bbfdddd81b5b0c27d1c318c9dc33393f91ac86b0c6768124e72ad688586f099c6e4c965eb29d027e26d931ac9a4e15ee3d1e17d9e736d61e543c3fab7c38 SHA512 f9651ae5c3707dc8794d300b2c049cbaf286d48f50c25a8ad4570623b8b8271925cec08d97babe3eb8331dc658ed49b77f0e8d0a4de0215b3bdff732d2cf8a60
 EBUILD mgorny-dev-scripts-31.ebuild 695 BLAKE2B a743b633c5732c86e68e91b2cb70462379021d834abe8818fbe40a90200efb624de722cdebfa64a5e187f70c83eacb21194c67bb16f938f89f033ccc0e7b0e33 SHA512 f52d547ca624087dd58db3871e02897e7187baf26bb6e455810ac01436a9b961201adad9d898730816933386960f5ed5a12d0fcaeed84c8bbf0180d67a355943
 EBUILD mgorny-dev-scripts-32.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
 EBUILD mgorny-dev-scripts-33.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
+EBUILD mgorny-dev-scripts-34.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
new file mode 100644
index 000000000000..4d51b8b82ec1
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-34.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
+SRC_URI="
+	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	app-portage/portage-utils
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+	!dev-util/pkgdiff
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index e50737f288f0..299c98ac26ee 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.10.tar.gz 22675 BLAKE2B 4272cd0bf65a2181ba70d12fe8ca593403d7217aebf2f4dffd2f69397e686c79bc93ec70c756f1e94c548ed2acd8af7470c022611c16b5f3571af860aeca4b9c SHA512 1993f597e92b0b1f004e492aa164d7de6cf6776285850e5245f3328de0396c54cfc58943c767afe1fd1c49a771a1f33c65b6bed3c7d164223767567c05e12af1
 DIST tatt-0.9.tar.gz 22659 BLAKE2B c67da6d71bd46a7a1e73810f6f837cbe18b4fcfdf18da2401ab696e69d05c3ccbdeacaf152999dbf49d39c20e0e9e656e05c294a5eb7128015ee06d25bf95fcb SHA512 4f8d4f6d56ce1389caee8a67d1ae13967692fad90e1bc484ec9ffd9fa057e858c2fc4e6cefa496b33c7565b06e7f71e012a94653de4a501f3b25ec77d07cea92
-EBUILD tatt-0.10.ebuild 855 BLAKE2B 5d6c7501ac37cd024cf5d23772ab912b7257a90959f76fe11c995ce85cc82cf5664214a50f74b8e23a18e6ad68fdba672194149b450fcaf71ff6c61d47edea46 SHA512 1ea97079799f0ce857840f19d7dc4b425de823dc3a67848cb7722140d302007adf13767989eb6b6159df14e11234f779909aeefddaccb439292019b9a9ad78d5
+EBUILD tatt-0.10.ebuild 847 BLAKE2B 7fa91be1ed18978b9b85dd3062ed8ef90672abe6b394cab44b08a8cf19fdc7256ffa473732b272435f12b49c130badd6d8c308d8f0f3b0e888a1dd31702e80e0 SHA512 30325ef671d211082ede37b209bb3b48dcbb1d2868886a0323b1beb4de2923b8ec79efdf3cfef3edba8d52410b1099f024cb6454c33630007baea0adb1240779
 EBUILD tatt-0.9.ebuild 840 BLAKE2B ab4aceed18527ea071f8b31018f4745b58971d61e064ffb6a912bf2aaaf7688194c062c954072df4f6ef66ff341d362d91a08e26f121d5ca5c92b2e2c4ed3632 SHA512 7aaff41567232a94c28f3f3939240277fce63af689dc4aedc9ef8279dfc6f62fcd68fe5fc5739ce4a46a30da07bb6ca78c3d580531897d7ce1cd4da62d8d9c17
 EBUILD tatt-9999.ebuild 765 BLAKE2B a2b130fc4a64f54e299452252d104cbaaff2ddad913fee9bbbaefd020f37d5d7ccd8550b28e64b50dbdcf540ef8f06e8c8480da6c9432c0553487bb464d6e02d SHA512 71f5e9ac4c9190c65979e7d24f160a861dee3313e9fe03297eb9620bebc32dc349cd6204a7401dd77fa378617fd21dd851773f269ce862880acfcbd195512d25
 MISC metadata.xml 751 BLAKE2B 5b6715b02cbb774a14a382cde64c0b2bf0896311aa553a1f8f8563a4374343bdf996b2b93238e4be2a53d3d648216e380f57706856489da2ce44f88017f14e1b SHA512 6f3ec390dd310176c49f6d7d298bb6782307afaf5439ce54aa6fa560b3fdf9be5d50e6f8afe30eee220a6d9fd61e7ac030e7fa79e8e0068519cf3089f9c46332
diff --git a/app-portage/tatt/tatt-0.10.ebuild b/app-portage/tatt/tatt-0.10.ebuild
index 7acb2752b077..a212aa7b2b68 100644
--- a/app-portage/tatt/tatt-0.10.ebuild
+++ b/app-portage/tatt/tatt-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+templates"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 267371bee4d5..01d91bbaecb3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index ba6cc31ab69c..e048379e584d 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,11 +1,5 @@
-AUX apvlv-0.1.5-cflags.patch 702 BLAKE2B f6679326fdf3263e5a304f11bb1b6d047fd5604288912c9099a18b9a990574e1031c92c751c147319aa8c0f9e066e8a239562483b56f77e29fecf649fe7f89d5 SHA512 de7842c8cb402f045240aa50bdf05a13c6e9a4bea099fc8c41f07329b330fbb98f6edc229f0bb78eec65b14ecfffe9240441387717024939c11b9a69cb65919f
-AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359832dee54f3ff4f5fbf7fa4249457ac74921b8fd9734eafdae2088321703df0b3bf56a89a1c33b96a15908b8 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5
-AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
-AUX apvlv-0.1.5-poppler-0.73.patch 282 BLAKE2B 8bd7926afd2ce2364b82e7f9c8348b2905e1c3cdd6ba3565b4191ec5b6cfa5565179cc58706286f793b5b02cba2dc6eff04076b2fa61eb0be1638681632eedd5 SHA512 b832ee8e8e7290d2294ac326e84271570f560a5e7afc29446401ad1c05f1b03998c054bf3cd7ec80813899e49c256f86c871b400ce8e5a663fa9ab22015990cb
 AUX apvlv-0.4.0-cmake-cxxflags.patch 378 BLAKE2B 44063fd090374654067c6f1b43d9d392fb0a6739ae1e44271796c97a39962e229b6ba597b29ec7a0e5b30501af3c62f5a7c0fcc3ed093985e4b253ed33a39efc SHA512 d52d7b7f4500c3094de521e8eee368d6b50dd858d78fa830067ea2fe7cb446f66850d57ab70e6f51281d7a86ac531c0ed89425480d1c5e371631f1fbcff23fd3
 AUX apvlv-0.4.0-icon.patch 258 BLAKE2B 440dfe9904c4ac79408c90c5930e7b6ffc26fdd084ac4320fd945679f69c5333ffc4120991658d045d1e4525421f973d7dce020814b641397b54a0706f510475 SHA512 039204036fdf6b8a26451ca7d4b5d7d2e6b28bac8df5d97876a3b3dcb1e5b24e1f030864cac41b7a4776ea7999dffa9053bdd0632baf2d43054474c28e9a9b3d
-DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
 DIST apvlv-0.4.0.tar.gz 4361302 BLAKE2B 99d61df285ff3b910ace50bc4b1b62601fe7ca9037f835262a8eac179ddcccff5f772121b223e38050243d4bc2da9532e17d9b38fbceb786971d77fea006f91d SHA512 a25033e52acf34b486101953ffaa5de604e3321f9b4705e94fa157596ef560351c1712ed830b2a950f92c054b600a33f903be58f8a7d222c27e5125fedf4245b
-EBUILD apvlv-0.1.5-r2.ebuild 1074 BLAKE2B c372704ea0105086aec23cf4a5ca647440e1a9c3dd90fee4e94bc285e6b78475cf0c7f43edd3b91b4999fcc22f13cb6d978837d9ad2c9cbf3e7ae6b1327a9060 SHA512 7b78bf8e5805f95348e4ae1dd7a6c8027bfc147f2db31b78739b7f343557a918db53831891ed1d0b71430ba2a963f44483277913de5998c7829a70aa7d7e3c5a
 EBUILD apvlv-0.4.0-r1.ebuild 1125 BLAKE2B aec2471b52af93c8435d3e3949e85687ccc030f2af562a9eba78e488646eb25e0d743d72b0f3acadbd67298edb736b1c52c6da49d158d14b140cfdd5ba8f7439 SHA512 1a9edbe4ffecec6f68d6a574b14a5e09cfa694c5b5785debfbae4c60edd7408d7eaa03ee9bf2db7d7ac9fce9a3e89b1457fb78efb728d0c5b8fd4079079994c5
 MISC metadata.xml 543 BLAKE2B 6e61516bb251d76663ce79b5c55ba6b7ea8fc6c3b1f0bd9ba4524e7b61e9f79d271599395daaeafa90ff2a44ad6755bf1185aa29adc0462bf65d4bdc9129e502 SHA512 c8822ce8ddfec1223794ac415517f17e46b06eb19207a52457b5362076342364fb85cd1873c0b39642f65bc2640eb752fb793df1d26a66140dd8026f81b8ea90
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
deleted file mode 100644
index 8bd32e2cccc9..000000000000
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake desktop
-
-DESCRIPTION="Alf's PDF Viewer Like Vim"
-HOMEPAGE="https://github.com/naihe2010/apvlv/"
-SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug djvu"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# preserve cflags
-	"${FILESDIR}/${P}-cflags.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${P}-poppler-0.73.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR=/etc/${PN}
-		-DDOCDIR=/usr/share/${PN}
-		-DMANDIR=/usr/share/man
-		-DAPVLV_WITH_HTML=OFF
-		-DAPVLV_WITH_UMD=OFF
-		-DAPVLV_WITH_TXT=ON
-		-DAPVLV_WITH_DJVU=$(usex djvu)
-		-DAPVLV_ENABLE_DEBUG=$(usex debug)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newicon -s 32 icons/pdf.png ${PN}.png
-}
diff --git a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
deleted file mode 100644
index d1859fa25701..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ae9ae09..5831e7a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,13 +1,11 @@
- IF (WIN32)
-   ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
- ELSE (WIN32)
--  SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
-+  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
- 
-   OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
-   IF (APVLV_ENABLE_DEBUG)
--    SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
--  ELSE (APVLV_ENABLE_DEBUG)
--    SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
-+    SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}")
-   ENDIF (APVLV_ENABLE_DEBUG)
- ENDIF (WIN32)
- 
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
deleted file mode 100644
index 0ffe3659d6d7..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
---- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
-+++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
-@@ -90,7 +90,7 @@
- 	return false;
-       }
- 
--    while ((getline (os, str)) != NULL)
-+    while (getline (os, str))
-       {
- 	string argu, data, crap;
- 	stringstream is (str);
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
deleted file mode 100644
index e55f2771395a..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
-@@ -200,7 +200,7 @@ namespace apvlv
- 
-     if (len >= 4
- 	&& *s == '<'
--	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
-+	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
-       {
- 	e++;
- 	StringKeyMap::iterator it;
---- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
-+++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
-@@ -90,7 +90,7 @@ namespace apvlv
-   {
-     mInuse = use;
- 
--    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
-+    if (mInuse == false && !gView->hasloaded (filename (), type ()))
-       {
- 	debug ("core :%p is not needed, delete it\n", this);
- 	delete this;
diff --git a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch b/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
deleted file mode 100644
index c3001d4b6196..000000000000
--- a/app-text/apvlv/files/apvlv-0.1.5-poppler-0.73.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ApvlvPdf.cc	2015-01-10 15:04:24.000000000 +0100
-+++ b/src/ApvlvPdf.cc	2019-01-17 01:29:54.479256848 +0100
-@@ -29,7 +29,6 @@
- #include "ApvlvPdf.h"
- 
- #ifndef POPPLER_WITH_GDK
--#include <goo/gtypes.h>
- 
- static void
- copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 4747cf7a5beb..f0ad72e6767c 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
+DIST zathura-pdf-poppler-0.3.1.tar.gz 9259 BLAKE2B c1131d2acc0cf69bf9266969839f6fb4e043664a0a4648d033f9338b1219d75e34576a03380daf54bc8fe52cc8bd2244a93394e15f8ff0bbb980fb903749affc SHA512 a6ea7d61f05cfbc6229ec81580c539841916b44085aeb168668cfabd41aca2e5321e88605f092caaa3efc30bec25a2bb319c687920a22b1f7f53e4b1e470ec34
 EBUILD zathura-pdf-poppler-0.3.0.ebuild 767 BLAKE2B d4955dc86e748ab9710b15b17c83cb2cff34e11d845eb3261efc854ba7b132a8d6a90c05b5b3001fcbbc6c6d128a1442272012388ff2d48fcbeaa6724e84822d SHA512 e9e573f14940d53d9627b782aabe16e1903044b7490cd03047d05bba924ddac57493b98449602bce074611535fef9d4f7a031f90a1a9f3347670ce2ea20cda0a
-EBUILD zathura-pdf-poppler-9999.ebuild 770 BLAKE2B 83a617fbab49073633f120c1d3974c17998b2d5b92d71e195434e7527d6fe4b1c1d9598bc82c8c84984e517ef2e27f884159899b1a4f30f0af647668298bb939 SHA512 d31e24d52bae236e369f46245ca852f0c7540adc22980f08a9a101fa10ce3084ffd443442d7086a93be2e1f04d302061f1d1125b0b2e94d4c230f58e1e7c6f33
-MISC metadata.xml 669 BLAKE2B 60a8af6a6f1ef902d941ebbfa7bc86fa10a773af260878d0bdc2d211d6792ae1eb28106e653247a03ffb3dfbc4bddf76d7332fd7b703a9e03dc37c90c69b1deb SHA512 c2afc877f4c46a55d662fd0ee6a66fd940f32e7b396a0124cf24209b1cf9d9fd2cc8dc05fccaa5a7a067f7760207a2f8b2ddc54964c6191f2a438d790b3a0d34
+EBUILD zathura-pdf-poppler-0.3.1.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
+EBUILD zathura-pdf-poppler-9999.ebuild 772 BLAKE2B 401c7396ff2e8a6803d67400065d104839437d734897454e73058abdfd603c515a21827cd9efe5ef3e3fceebb9c359e17173eb0fcc6fcb00c201d71fa892b464 SHA512 e08a7d327ee0ccbbab0f2881ab8ead87ed28309b9f6e27b32014b9631ab1f9f95afcb9f286293ebcedecd8bb7d6480ad8a748fd82be12e5f952b7c1180b22539
+MISC metadata.xml 742 BLAKE2B 25123046ea688616972cd2ef7347eaa72efe9136914abc7b54b2afbf3f85afdf487cc9e246cd1b2de45f2109998c34005b5f9041d6d15282389e9942b357beac SHA512 bddd3bf740e7ef9a6327ed9bd29e2224643fb7403486417b98d6e00b19af7405694d3d726de28090a00b0c469a238d721664240f6e524d3c9bfc816ff431eca8
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index 9e8a429671ba..61d86c13239b 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -7,15 +7,16 @@
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
-		<email>mlq@pwmt.org</email>
-		<name>Moritz Lipp</name>
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
 		</maintainer>
-	<maintainer status="active">
-		<email>sebastian+dev@ramacher.at</email>
-		<name>Sebastian Ramacher</name>
-	</maintainer>
-	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
-	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
-	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+			<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<remote-id type="github">pwmt/zathura-pdf-poppler</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
new file mode 100644
index 000000000000..cda9cd6aa073
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.9:=
+	dev-libs/girara
+	dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index 448941a99c64..cda9cd6aa073 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="ZLIB"
 SLOT="0"
 
 DEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.9
+	>=app-text/zathura-0.3.9:=
 	dev-libs/girara
 	dev-libs/glib:2"
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 18cd334d0bb6..407472320840 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -2,6 +2,6 @@ AUX zathura-disable-seccomp-tests.patch 676 BLAKE2B a0fb24ad08247cb14e8017abf952
 DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
 EBUILD zathura-0.4.9.ebuild 1355 BLAKE2B 82e932b9fddd23316066c358a6aede8480532c970a992270f9f6fa2a3c7545b4286249d4ce9a96b9079500ede0e2371fe8682e2b234a93c4e351d1781507b7ea SHA512 7978966e9716677442b274af5792aa3e2a682f7e1963ed6c3ed094f322e8a12db1118525b06c600c407c362177584c543679de2583cfadfd5e4ad95e86d30734
-EBUILD zathura-0.5.2.ebuild 1363 BLAKE2B 0837cff7f4afc27c1f95581325c0f554fa9fcb87e40082f5bddabb9e129c135d63596d883dd58be7471a36c13da84deeaf65a4d50c26d2aa9c8a5bbb4c752561 SHA512 ef35dbafdc4eb52a83bf8d667b79306f67df8dc47d4ba4c59717b711f1b158a134c73fa0b3b557210fe7ec12490bc231c33d137ce72abd9cd6fdeac5077e6aa3
-EBUILD zathura-9999.ebuild 1358 BLAKE2B e7b0c718a45053c4221a28533fbee7cf6b782521aa27ef78677abaeab8478948a889a525e3afae27eacef51551c60c6b67960c4208813b0576a92b61803c5309 SHA512 df6e72ede3828f94b783f1bbd5caa7907b6be8c261f1f249474744d6cc199b4d472de23a59e0c35a07200928cd35e406a332f0f722f989c519a5d4a2695f7695
-MISC metadata.xml 769 BLAKE2B 417d92ddfcbc7c2352a79c4275022515fa0bf31b7c06058bb29452f7e15882b59ad3d2b92a2aa8063bb54120377e028449c0e253cd2aeab719a92e4853a3eea7 SHA512 9f7284f67e9bb6b454670393431546685ede815937bb06f7a73ebf25c9cbecca734a8e09753ffc803f8f44ce3a67002c59e31d98bce6185b4237e5d499e3165f
+EBUILD zathura-0.5.2-r1.ebuild 1378 BLAKE2B db094c73bd02339d3369f087208544f75dd745c226df070d109cd55bc1ef67ba7e6d3ee13e49fab2e50cd5ada0de1bdbecfc05eb1cafd70ce1437ef389f4445e SHA512 9612f653fcf23efe7204506bf66d2c43aa9137bc072fce26d1e6d182844ed65a0084a4ac46cb8a3cafbd514ab11ee7889cd3f06c6fa5129e53b870e2c3545888
+EBUILD zathura-9999.ebuild 1378 BLAKE2B db094c73bd02339d3369f087208544f75dd745c226df070d109cd55bc1ef67ba7e6d3ee13e49fab2e50cd5ada0de1bdbecfc05eb1cafd70ce1437ef389f4445e SHA512 9612f653fcf23efe7204506bf66d2c43aa9137bc072fce26d1e6d182844ed65a0084a4ac46cb8a3cafbd514ab11ee7889cd3f06c6fa5129e53b870e2c3545888
+MISC metadata.xml 821 BLAKE2B 1e00497e754b684be18ced6966f830350bb6c9529a3993c4a1c17b9f0f6d3512e864dafc10966be8e5f338a8f4484335f2debe239914ddf2d0bc0ed99895bf63 SHA512 ff0cacc5dd1ed909ddd5080fc949dc997ffcc1b5ed429b9cf9d5e3d1447bfffc89ddce79371ef387c5064fd0df65f15d85c665ee2125d4269093e536a7b80c6c
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index f7b9cf89b9e1..63a71a9577e8 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -20,5 +20,6 @@
 		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
 		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
 		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+		<remote-id type="github">pwmt/zathura</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura/zathura-0.5.2.ebuild b/app-text/zathura/zathura-0.5.2-r1.ebuild
index a348aaac0cce..88dfa8dc6291 100644
--- a/app-text/zathura/zathura-0.5.2.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r1.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="doc seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 0de2aed7939f..88dfa8dc6291 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,17 +18,17 @@ else
 fi
 
 LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="doc seccomp sqlite synctex test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-libs/girara-0.3.6
+DEPEND=">=dev-libs/girara-0.3.7
 	>=dev-libs/glib-2.50:2
 	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
-	magic? ( sys-apps/file )
+	sys-apps/file
 	seccomp? ( sys-libs/libseccomp )
 	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
 	synctex? ( app-text/texlive-core )"
@@ -40,10 +40,13 @@ BDEPEND="doc? ( dev-python/sphinx )
 		dev-libs/check )
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/zathura-disable-seccomp-tests.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dconvert-icon=disabled
-		-Dmagic=$(usex magic enabled disabled)
 		-Dmanpages=$(usex doc enabled disabled)
 		-Dseccomp=$(usex seccomp enabled disabled)
 		-Dsqlite=$(usex sqlite enabled disabled)
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index cac89fef1fa7..af8c2fdf53d5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index d4102e4b4075..fadc7343370b 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -28,5 +28,5 @@ DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2e
 EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B da5ea9d8bfc65693a41de30ef15e5d6696b14125fba39ab434844584ddc0b1f9109a3639e92960a603ff7ab731f3d7f0d44b64181bfa43d89d7859865dd8dd8d SHA512 0fc85564401be8339cdde1b80d062cf10d34bd9b1bc70089b1dafa59f095270e3d40b152af08a83346e118caa27448a6b669a56628c8b8c8615ceddec40311bb
 EBUILD mongodb-4.4.8-r1.ebuild 4903 BLAKE2B c602d42d89270459366686525694272cd54787fd754ddc6b00701c8de5ddbdf0519bef71a0c71d59e70d9b0e3b97c62c4280cb6737600f88ef8a5b94bba4f483 SHA512 ef2172a0bd7b8d8d8c9dc5ae0300dc0ac0c314f13ae21b746fd2379491b3cd24d1af5cce7e109729f32afbf9f4bc29bfff4333ace1fb0480c92b7eed3aa1b62c
 EBUILD mongodb-4.4.8-r2.ebuild 4924 BLAKE2B 5d86b73af2fdb8acda610b78d86f7c03df78cc1e5b7402b387c7b9ae949ed80acdaad7b9ba8f46009c0297bd0bde4b254c26ce8ef093bcc0d4dfe512ccc6d716 SHA512 e93418f15093950e6818dd5bad0b5f0d6ac83cd5cfc13b50068cd6ef71ef2ac2781488652f38f00adcffbdc02e09e7edc7830380c5f4e2707bf26f7ed85d3b61
-EBUILD mongodb-5.0.5-r2.ebuild 5266 BLAKE2B 6acd233dd21409b3b0aa3c47571dfbad0f31b11d0edcca6857f5cbfb67d452ce55673f01968edc12864baa076a2918ce428447a5cb387a928b7e5b15c5981975 SHA512 df6042cccd4e7872e8ad0c135d3bbe96d4201dcf2e4671f84fc8dd240ce4f4c03ec725021949902aba39f40b3f2e2aeef8407f84457e9c0c3f81e6372291a566
+EBUILD mongodb-5.0.5-r2.ebuild 5265 BLAKE2B 633f70fa2ff0b19d0b20e18a404e7583aba7d7ef4ef560c09b71b42b4de35c5a93e8028e4f41c0d8ecebc7c46559cc8caf413ed793e32958c54b9bc1d6357dc1 SHA512 de797c1557147221da61d10c7bd287b2807b992337afc7575b9c17145a241dbaaf78cc6dcbe601a3e253f89160d50b19124adade419d19956d36638f668b1835
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
index fe18f3873d13..029972a638e0 100644
--- a/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 -riscv"
+KEYWORDS="amd64 ~arm64 -riscv"
 CPU_FLAGS="cpu_flags_x86_avx"
 IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index c0ef16fc1de9..32041d6af50c 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,12 +1,6 @@
 AUX sqlite-3.39.4-icu-72-test.patch 800 BLAKE2B 799fd4df209886e5df6fc050247719a0eafae494bd23c3ee44e4e1c0b86da036d438ac86f763101b846fef7b7f3c1196c0ebdbd3e7aa70394c76307673a44cc6 SHA512 dca2f9552e144dfb5636c4796c634d892d1de0beb980ce6683906266fb4c9a9a98e03eb92c8c3fe7a8de427ae41d0f784ac32c0f93630563cb6a3d6db6fb5493
-DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb
-DIST sqlite-doc-3400000.zip 10921883 BLAKE2B 786bba5f4eec32114b0e12d0a42eb763c3be999506edb65e72a1ea32499c9972be9e546b4773a96165273e3eac4da9c2e3c2c696e07494d8af8f273da72e44fd SHA512 3557fe49e08fd24890da584f3fa7fb93d1e3317787f98a8ce1062dcac07733782026e50dfef7db72582739ddf0a77095cc4d3a81f3df097a69e85c672591bf7e
 DIST sqlite-doc-3400100.zip 10934836 BLAKE2B 52adbfa911a5d8556e4e071bf14ad83145023fbd426f285d9724d7f06e41257df53d3c28224581f12b4ca8f699bf3d3ec829ee161374ce0208783e5da72639dc SHA512 1131b0a6304a4dd6287c85d38d1450fd2dd0e3377d88a263e3c4716415e0587750357f25486727b9433797da0331229682565e7a8a3986eba89cfcab550a2d41
-DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb
-DIST sqlite-src-3400000.zip 13723231 BLAKE2B 4b4d3119f3210497e4e41f1305558e7ed49505b635fed18f466b5fb8dcc60712d0c053a0e569f9af4b2b37803d2670528244bdcf6ef580fd3f85510e8d4dba78 SHA512 c3bb3829f99c663f3381f4c610e401173f133fe944558b70da7521cc44116d048e4e1651993feb128b0f3814381aa4fa93f48ba3e277abca3442af805159287d
 DIST sqlite-src-3400100.zip 13725560 BLAKE2B 24d2efbbf7f8f35888b1e53c98f9c7fece9b1cf0b175bf49b78869253aa753ce47e2db67247183c07368e69d6eb63a6e39c06b212c8fd5ca36c892ff535bedca SHA512 78f8c6396bf8da090671c6f4c41255e60788324fccdaad906c53610eb6e37705f4d25c7f84da3be00b511ddf9f2e0545901f33f5ae4b6e00b1ea9413af095299
-EBUILD sqlite-3.39.4.ebuild 13307 BLAKE2B e47c50098d916a84cd7586e4a0d9246618783634c208c3e3f84b32db8315a0804c7d03f6d68990a33b5b8014fa4b01f8e013d26075f39ae07b7eef102ef3307d SHA512 59f4886e978daf7af41a4665a4e7ddb8ddc5ab7fea6cfe8f5b40303ca112ddd44007e6e8342e4235ca6e67b68a13d0259cbc65e2b88a88fe3e24930935ea7c58
-EBUILD sqlite-3.40.0.ebuild 13026 BLAKE2B 7362352c63c8ba197ba953e2aefd9248ce50f7b51efb0e6919a1299a3e20962b58b23fa54262abb52912a0b337549f3b88da65aecf3bd284992120909358ff5e SHA512 bb7a06ebbc86c75b584c59c859c2e47bdf68cfdf96c127852b4fd77dc6c05f26e6135cbf495d7d2fabd3a9a9477f3678d9fe60d008d2d254a5aaf067ad68c22c
-EBUILD sqlite-3.40.1.ebuild 13019 BLAKE2B 1c87878a9a5f689c5926594dbbcc28b9554d6fd0645970f4bce5ba1d4922d265677b208637642ccc967fef410c58d5af6b3e183129a58031135d3722d1d2f9ab SHA512 685b8c116bc4cecaeeb43943bf99cacf789f944fa970e055839635e4956e42e93151798bd0c9200c9fee08e4aab8581286c7955ef25dba8b395d7b2c56be749e
+EBUILD sqlite-3.40.1.ebuild 13018 BLAKE2B cacf271b8d62005ff052e2f76e64be08d772807e24c7609cce41e610633faceff5ed3583fab6e15489d8ee79f8643b637accbfb05aac1d537ef48529d663b8da SHA512 dfd0999b6bd41f54829d8d30679ac9592f9ba239864a70d3c1c79d09f173dace94dc9b23b15b94f2e6a9ba336f76b3871a65d901b28e58ab1c1080c128bb897e
 EBUILD sqlite-9999.ebuild 12967 BLAKE2B f6724f1c26d68d81390a6acecbefacae560d4c396f870749131202fcd9c59262fa07bba6b3629ef9c988ca8758ba29927df178dc0d35c717f9799682ddf6e344 SHA512 02598d374b55edf52ea3641b06812b554f80beb48137166b81b285499b92872574131e1afef3ab5d3ea6b7791cf1c2e47e86e144c2e2ad472be7adc07229353a
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.39.4.ebuild b/dev-db/sqlite/sqlite-3.39.4.ebuild
deleted file mode 100644
index ffcf6d08808b..000000000000
--- a/dev-db/sqlite/sqlite-3.39.4.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
-else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
-)
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	# debug USE flag.
-	options+=($(use_enable debug))
-
-	# icu USE flag.
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	# readline USE flag.
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
-	fi
-
-	# secure-delete USE flag.
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=(--disable-tcl)
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.40.0.ebuild b/dev-db/sqlite/sqlite-3.40.0.ebuild
deleted file mode 100644
index c10b8c754db0..000000000000
--- a/dev-db/sqlite/sqlite-3.40.0.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ ${PV} == 9999 ]]; then
-	S="${WORKDIR}"/${PN}
-	PROPERTIES="live"
-else
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	#DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-
-	SRC_URI="
-		https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )
-	"
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
-
-LICENSE="public-domain"
-SLOT="3"
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
-"
-BDEPEND=">=dev-lang/tcl-8.6:0"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+=" dev-vcs/fossil"
-else
-	BDEPEND+=" app-arch/unzip"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
-)
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=( --enable-fts5 )
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	options+=( $(use_enable debug) )
-
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-
-	if use readline; then
-		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
-	fi
-
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	options+=( $(use_enable static-libs static) )
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=( --disable-tcl )
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# bug #839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ ${PV} == 9999 ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ ${PV} != 9999 ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.40.1.ebuild b/dev-db/sqlite/sqlite-3.40.1.ebuild
index e701724ef344..7013595958a3 100644
--- a/dev-db/sqlite/sqlite-3.40.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.40.1.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~loong ~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
 
 LICENSE="public-domain"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a0235b4a5754..b224ddc55fe1 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index e5f608c048d0..c62dbb6a01fc 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -4,5 +4,5 @@ DIST asm-ASM_9_3.tar.gz 1666740 BLAKE2B 6905233f666159f861dda68a855e8f5632817b06
 DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687
 EBUILD asm-5.1-r1.ebuild 1291 BLAKE2B 725d3131119c130036a1d9ba211731c75700c62dfca02b9fca40125dabb8b6cc8233d3df6f29edaa4341d5412d695e8ebd7c70f3e0bd84a0b2091f3d7375fb51 SHA512 ccceba8cf7a50559aa3a505cf8450d695da2a927e0044fcead1878c156c17eae7ff25cbe25d84b4ed780f930b4b669b30d0ab65289bd141272eaf4febd4ee002
 EBUILD asm-9.3.ebuild 1596 BLAKE2B c14991f2292a3c005e176f714c5f75798824284aac7563902c876ae38bf738d548b999d30b6ac21be9c3512de1e56736dcb3d0a30155cdcedcef6750d9bd9372 SHA512 787f4c1949ace552c29dd4a739c51d02814e8500c42c8108f6bcc5b88c48f67b21afd091928806e69713600bb56ab627e6b3accc793300c5cffcedb9369fdd22
-EBUILD asm-9.4.ebuild 2367 BLAKE2B 1703a204f3acda73637408d224886f71458abba801cbc04809cd9cf24e35837cdc268fb6307e5aef0ea497664deb025dbf304691b0c5c0ac329ec36f5c5334f5 SHA512 31f2468a2958eb4760f29242be8fb2c5dda12621908be79028951cae5e7a9319177b0cecc57b8c2616b2838eeb79cb6f0e5be9ccea34b3786e6b56d6361bcc98
+EBUILD asm-9.4.ebuild 2366 BLAKE2B a3a79c75202680f649dd5d0495ec7c3513cb6e9bf9663d5898dad9ff741e4ac661fcb80bf5d63a8b20c4618beda3e541ec2556cd1969354bc8311116258a7175 SHA512 73ad4365d9e3d1a84a77f50a89b26bcb10fc27017949374b9c1cddfaa113a2d5f353d4786c9eded90547292ed095606093dfef98313edff44756111a4c391508
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild
index a53653b4d749..ae40084ac6e9 100644
--- a/dev-java/asm/asm-9.4.ebuild
+++ b/dev-java/asm/asm-9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~x64-macos"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 96d46b94c7e4..1435203c362d 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 55a6ef4aaa53..de59e9e558c8 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -3,5 +3,5 @@ AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e1
 DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
 DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
 EBUILD ispc-1.17.0-r2.ebuild 1649 BLAKE2B 5547751ed9b2631c4ea5b1466d9580a98b16d92e191e85d16fe71cbb04dd28acc05818c52b9bccd2893e487902d074ed1678af12294f3968acbf02813ef57eba SHA512 f979e3d8cbf68d2c40f0c9169d7a5037c444dcb914592e49daf4a04de7cd46f72c4eb03d18a237fe5508eeb787055cb4122d9ee31f4420d83771c99c844ab339
-EBUILD ispc-1.18.0.ebuild 1760 BLAKE2B edbf2f8025e123d8583446c4a70c4c50813c211ad2e97dfa2d67721a9362ea4e6edf1a42542b9cf33a515b924c422a1cca51697108007aca0d3afc77922e2897 SHA512 61119b85df7bc9146c526b1c30c3a208a6d25f97f6aae311c011fd674e8e8742e7e03a2263cf36c1c7edf672b3523c768d6629b84f09787e6c1000a37afc4697
+EBUILD ispc-1.18.0.ebuild 1759 BLAKE2B 19af75af6110af2dbdccca8088744f46fecb7b79066a75387fe92a607156bf93a9c3e5a4cfedbdcda58e1281d4fc767806f259217fc6b3a931708a3138602397 SHA512 53c92bbf850fb37cc5355356792061a438962e14a5f6a83568e7e3a5884cccc88d4399dbf39937738f58a7f4f0ef327db4f33e2ca630aec3556a8677fd472ce0
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
index ec835cb94bdb..0222c2396d5d 100644
--- a/dev-lang/ispc/ispc-1.18.0.ebuild
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD BSD-2 UoI-NCSA"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index cad503e3b4df..23d05d3b7bb9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 6c3fceaa3fc0..99ec8c614600 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 DIST astroid-2.12.13.gh.tar.gz 437906 BLAKE2B c00462d44c9705dc5b46fc52915e6a44e53e840d5326427d235c9156bc4de58b184271338ebc10a4572e1aace8d4ababd3bd7e440a6ee585aa66d15dfe4117be SHA512 16d062b1a619663b157c4753f1744e56e7d0ef7cace12660feb7f6bc540e54be02638b52c1c877d3eb514e2d7423c4afc71e7d5464880bfd3724ff7ae6d7b90a
 DIST astroid-2.12.14.gh.tar.gz 440473 BLAKE2B 5b3d55664676b806af73208a2fcbbea2ee0c48bfb59ffa4f54fdc6dd35463d032b4b033530c9d10c52289f3d51c8d59c4d35330a427110c76a1a4566162ceddc SHA512 cdce9ed35ec107bb7ed4a7eb9e778f90c248dbbc00e3da5b4ae86340f960b71f31ffea0cabb677f17bde9daa28f8bed1de4a9f331b8cc975d85793a44dc29b65
+DIST astroid-2.13.1.gh.tar.gz 449003 BLAKE2B 1630cb4cbdea3544942863c58681ba1d5de81bb5d5e49f58bb498d689ab4ad4533bee169eecd6796ad5a62282c8c1f2dc69c7b59b684d1758e0e6e9f8c0f0298 SHA512 703540b1b5ec65d04e56b349cdd82b59672749e58d10e546cba0600ad65a02d05195400379c5534e8b9142b368974d1e18526c86c5ac3b6e2d3dc8db95d7fec7
 EBUILD astroid-2.12.13.ebuild 1816 BLAKE2B f1f21f45a5b36043905eebd5153754d0a4feb88b05813052898b70379ddbb7350be1440a8a7fec3209f1a664f71dd83e46948283314fa1697e2189ac12d4ef65 SHA512 5042ae5ad74caa9736d55880f623e6d73893de397bf1e594dac9efef4858320ccaecb26c9fbe8fdf905c8c9612a995795af7b7f7c949fe83f8a3c73046577760
 EBUILD astroid-2.12.14.ebuild 1824 BLAKE2B 9644ee13a4da0148a7150e579e110d37117b7c85d679aafac6a7cc99b13c17263eaa1349bb32e1e987e329daca30ef6814689eb5e528be6e2f14231dd4ca45c5 SHA512 177e95f9b017004667b2db9fbeb2e2ed3d957ef83516a77660adfa7ac8550aabd3a752bad5801cbea6d7312b73ce445504f97852a59dd85588151f9fcc8e4742
+EBUILD astroid-2.13.1.ebuild 1916 BLAKE2B 699eea6d79324e87ad0c8f76b0da170467768b7ed6169eeb08012bcacd4c94723ada1591ab629df5699c7db57f966924a4edf0d48a0783ee473f291aff37ed5a SHA512 2b31ca5fb7316d11133aefed00a5f7629ee7f306daae0a14d410533e354da98915bcd2602223939b368a91b79b754ef5bc8669b09d83c86f2206a1d4b6630a10
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.13.1.ebuild b/dev-python/astroid/astroid-2.13.1.ebuild
new file mode 100644
index 000000000000..2cb9b1163758
--- /dev/null
+++ b/dev-python/astroid/astroid-2.13.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/
+"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why they're broken
+		tests/test_brain_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index d1a7f36ac601..54c518fbf936 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,7 +1,3 @@
-DIST cleo-0.8.1.gh.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
-DIST cleo-1.0.0.gh.tar.gz 154114 BLAKE2B 7a8906b4a40c1d1a9899f2195a4e4a35a828c2ea7713df31a94e40e7e930b8624a24ff5bc219140b5e42e100f96199393c940aa1bac24991c380f2136762dbff SHA512 a45af3f4ff0fc9535363bdcf265ab3d7726af99cf4b48e896f9d5fb1404721b4641f80e37a7266690a1f7d4a261cbd4c746338294ff29745f782f8657cd2bb07
 DIST cleo-2.0.1.gh.tar.gz 154222 BLAKE2B dcaeff38c2dcb13b3c11200aa97cb2a1c16004558aabf9b44f1ba7ddd5d9c8c7784ea0ba1c50c19b015a6ff0659cb116b8ee926670091e39fd2b1cfd426cb72a SHA512 57a8e9cfc5486f73ade424199aaeb3def787a958031691aba2c6a230323d1c816316e3639dee7a07111aa0fc852d7088756f515cb24fdc84a40056ce969e5884
-EBUILD cleo-0.8.1-r1.ebuild 685 BLAKE2B d9e20e7dfe63ffbbb870c619b2acba0df1cacbe73c5ff11fdd8664213b6dc8ca551800e02354e4bbbf05051ba3e72d8e6c3c8fc7f9926bbce7ab4d9400820b2b SHA512 e32f7ebd874b0601d81d3741f9989e5a236a3cbc8b0d58beb498db87bc54abe3356d16514add227bdfe5e88e64d0bd7d4d5102cb3dc90614a458586fee819a76
-EBUILD cleo-1.0.0.ebuild 694 BLAKE2B 18f2a0847836bb6ddcc0feda07c0f9988e9869e22bec3010ebe3cb0a081767cacc5fde7931ac9de7286a82c08594f922fcd0b2f55f7f8e36eedfd502f1a153e4 SHA512 119f89d47b56c8f8dde111589dbbbd87287a29d40a343a82f41e904adf90171f2fe53328a9076300ad732a5f6595e95e847cd75e92ff3065b2cca2db53d0773f
-EBUILD cleo-2.0.1.ebuild 807 BLAKE2B 23779fd1cb5a23ba9157d137a9ac3707d414b8ffab75472e2256bb615260a8f98a25a5461bf8601bf5099e9cfa33bc9b2190f4ffe66c8534798d0d535672796c SHA512 ff69133f7227be948c112ce719648551ea3a4ee5a09dafc054c95ba3089e631c9d8a97852d99f0de199b9500272cf3f5331a16efe66148078a2031a29bfdc36a
+EBUILD cleo-2.0.1.ebuild 811 BLAKE2B a66761d9bc686d24151b1e79d08d47e6092ddc86de5d850fa2ab4c17f23c1671ebfe35d383fd92c6f5b7ee20ef5d7617589262af499ce97b6a785e3b74eeb75b SHA512 277c5a024eef8a86f0fc51e10163a50fa5be4eb5b1280a6fdaf617e2d9cfdb23da49c91496744305c0406f1c2dc576733b16322168c2a30bae9c44472aee814f
 MISC metadata.xml 517 BLAKE2B 57f7a68aac9ad122e22985a8c0653b1d2e0d558af70fb4c2647ff605bd38034513052e54bd30de61e8b3fed9deae3aa7f8b6ad656cc35c9d48b7c33024cc1496 SHA512 f36d1fcc2cd34ce638cae69f32e810e45873870e0b1711d747ef882b4463ed3b0da8881989539b00d2bfc7b39f9e5886b2b378575f8108bd0676ff28695cdcfe
diff --git a/dev-python/cleo/cleo-0.8.1-r1.ebuild b/dev-python/cleo/cleo-0.8.1-r1.ebuild
deleted file mode 100644
index dceca0cd300e..000000000000
--- a/dev-python/cleo/cleo-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for building testable command-line interfaces"
-HOMEPAGE="
-	https://github.com/python-poetry/cleo/
-	https://pypi.org/project/cleo/
-"
-SRC_URI="
-	https://github.com/python-poetry/cleo/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/clikit[${PYTHON_USEDEP}]
-		dev-python/crashtest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cleo/cleo-1.0.0.ebuild b/dev-python/cleo/cleo-1.0.0.ebuild
deleted file mode 100644
index 0b8691d3f4b7..000000000000
--- a/dev-python/cleo/cleo-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for building testable command-line interfaces"
-HOMEPAGE="
-	https://github.com/python-poetry/cleo/
-	https://pypi.org/project/cleo/
-"
-SRC_URI="
-	https://github.com/python-poetry/cleo/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="
-	dev-python/crashtest[${PYTHON_USEDEP}]
-	dev-python/rapidfuzz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cleo/cleo-2.0.1.ebuild b/dev-python/cleo/cleo-2.0.1.ebuild
index 19df73ffdff6..1f0ee2c3161f 100644
--- a/dev-python/cleo/cleo-2.0.1.ebuild
+++ b/dev-python/cleo/cleo-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/crashtest[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 1b7524b73855..492917079c7f 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -3,9 +3,11 @@ DIST coverage-7.0.0.tar.gz 780514 BLAKE2B 2d7e0190bacd5ef6db35e3c6ab5114571ce394
 DIST coverage-7.0.1.tar.gz 781226 BLAKE2B 52da1dd6f3eae7d235a597d3dd24d4042ee1ee4c082d5700d04065b8328af01ef006121a3588f04e79235c559e6dc6d2f5168b5079037e19a41e1b8e869825a0 SHA512 63ec6a21d4af73720a2b79309cb1d0e61bbe67e04835bd907f19e482c1479cbb69d353cd42be0d4d9e75cb4082debb464ec5e9acf270c86042e7db58de1d024d
 DIST coverage-7.0.2.tar.gz 789237 BLAKE2B 6a83b6736374679e855eefc99488eea8f4fa8b785bbff6455c6087a03b3d074d200b219fb7f9eaaa08824b9b37363861d02f0ca0cd157adf285b1e2e7bec92a2 SHA512 d2981951517ac1efe08df4f19931dd581fc1877d7095003ae1b0c63e10b388238bc793823471c5ac3243f6b46e9284057f3e569a14dc972dcaf342768da9d73e
 DIST coverage-7.0.3.tar.gz 790351 BLAKE2B 0e0e2e0dfd6773bf78318b63400c6ba15b8218590d9d2c99666a2d6bb41745aa7d00b7c32879eabf9c0f6a2e3831637970fd8ea308a50befd526f2e0aafb6867 SHA512 6a298aa7fdf460277e85174fe930bf4dcdabfa57b753adda2d4b8381cd61c2e22700d287fefa16f098de318e6d79849c4db85a6d9f6e069f0acd5ce6ac93f154
+DIST coverage-7.0.4.tar.gz 794474 BLAKE2B 4c3e2e53a3a5bd55d2ba8c409a1983e96ca7ace33d69052f4e44c27d53e3732513a35c7e3e553fceffe06d5c9d664f548ce59ca171b210dafc88e6a7eb657d3b SHA512 f3f895af4d91a796b8ebc360ad116b78acf71a0f55cc1439a203440241e896f6666d9eccdb69f2cfb8162275755137356cb8b1df6504faa51f0a026d694abceb
 EBUILD coverage-6.5.0-r1.ebuild 1879 BLAKE2B b6988614ec609ed02c0adb8faca1c2c77ec581a9fa514ea848cc615d2a771e90031d83168fdccf2b02cd156f9031bf990ea867127bc54817a442977c0a916930 SHA512 9ea2255d4ab0b45832c694adfc456342adec446d13056e095434eed08efadeaa6708e6cc5af53eb231dbf126b7a98f13143ea086b90501aedafb3f675479ea30
 EBUILD coverage-7.0.0.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
 EBUILD coverage-7.0.1.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
 EBUILD coverage-7.0.2.ebuild 1887 BLAKE2B 8381f36a22fc97974d666999fd24f9f2219168e50dd151b465e52dccecd0d9cc889504a60efa79d8b725c7814f22267965d1c7a78d198b7056604511f989fd2e SHA512 c02d06d4662ec76904fe88f103080e8d34e7f088914cfad0882091111b24661d8d9504f7c168c7388a9a086ccc2deea8eea7ac64889ad581e551855fd3052f0b
 EBUILD coverage-7.0.3.ebuild 1887 BLAKE2B 8381f36a22fc97974d666999fd24f9f2219168e50dd151b465e52dccecd0d9cc889504a60efa79d8b725c7814f22267965d1c7a78d198b7056604511f989fd2e SHA512 c02d06d4662ec76904fe88f103080e8d34e7f088914cfad0882091111b24661d8d9504f7c168c7388a9a086ccc2deea8eea7ac64889ad581e551855fd3052f0b
+EBUILD coverage-7.0.4.ebuild 1887 BLAKE2B 8381f36a22fc97974d666999fd24f9f2219168e50dd151b465e52dccecd0d9cc889504a60efa79d8b725c7814f22267965d1c7a78d198b7056604511f989fd2e SHA512 c02d06d4662ec76904fe88f103080e8d34e7f088914cfad0882091111b24661d8d9504f7c168c7388a9a086ccc2deea8eea7ac64889ad581e551855fd3052f0b
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.0.4.ebuild b/dev-python/coverage/coverage-7.0.4.ebuild
new file mode 100644
index 000000000000..ed343a56f333
--- /dev/null
+++ b/dev-python/coverage/coverage-7.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 093591d841a8..d63264febe8a 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,7 +1,9 @@
 DIST django-tables2-2.3.4.tar.gz 77706 BLAKE2B 54e0903747ab29dab26049868f8cfd412d23fe3f36eaf292bebc90ee1c307f08d04af1eed469423e3699db227110fc0347a8034acb3b3b46971d37b3aebb84a1 SHA512 d10144b79850847d2787e4a97f450eb3709a419a5dcd330667e3746c16f3be7472c6c26dbf7d765356130b79b8c915c46fd3201c83e66806753f1bb95911895f
 DIST django-tables2-2.4.1.gh.tar.gz 429723 BLAKE2B 80361d419279f548c089c4da990a45c6b43576746ec2762928af907415f3ea331a89f7e0ec7b792d27e15ed409b25f3ee26b3794cdb16255835f0d74faee068c SHA512 e2431f86e049b9dee1100d48727ea2003e431a3ad5bf8e8a4b773d53dc4d5e90ec310a7f07ce7532e044903d760aacda37b3512770f6e0db6527842d1cbdd6d9
 DIST django-tables2-2.5.0.gh.tar.gz 430376 BLAKE2B 592a488fea869c2b0630c8d3ad72182636206a2b394355a2702c2dbeac43a67f9175a9f7756349c3d7877d2887af0e32816e2a4c9ba5234f04e9828fe38ffe29 SHA512 b0a31860205c5e68a520d1fdbfe16e094701dbcf1cf8c46d62c32b8194c121271832f08ca0fdb4c05cb52c1fde5ef66e323d3f772e2562da4f48188128cfa8a0
+DIST django-tables2-2.5.1.gh.tar.gz 430778 BLAKE2B 7811880ec49a514b74252d32fbc59d800aaa34fb2bf4af5675d1c4555c7a52f9eb3ca67d8d940697146c07de1e42006c6d3880a53b31a386bd088aa6939b056f SHA512 baf955b255dcbcf09250cfdbb2dc1fb51f3f9142ad29bf4ca8888344d1bcbe9f23a59f1509cad7e847d82bb6d410a494ed9eae1d4d4ca633e7f0351e4a98839d
 EBUILD django-tables2-2.3.4.ebuild 501 BLAKE2B a1c70c64e136118e01d068ff33d661665190f654efd10897d359fb48424aaa4279b41efa310378ab5f3e0ef7afee6f46289c3acf6bd2fa717def98c0f2b54645 SHA512 395e9bad00b6b3f0047fd2cb402f0383481289888c1b927b7b3ddd449cc5a9a3645b8718a2a7c9738462154d5c22182e8358535478206fde136912d26588af63
 EBUILD django-tables2-2.4.1.ebuild 1085 BLAKE2B c6005cc5bb521ca2c34bc122e3808de2081bd018f3f7b623c276d97523867828b595f14277a48d6c59e8cc790a944d13b99eb704fe2311513757be12e8cae939 SHA512 1a966d0e2c464079ba3cc89687f6a0b8b8cd8f083077d36b8e10b187d5c2e3a729ab22537f3d5f6de28461b7f824baeab09c39a67c83ac63e807eadb07416fb4
 EBUILD django-tables2-2.5.0.ebuild 1084 BLAKE2B be60a4c006e3c544b1c8d013aba123d07913c7997b9a5fff10bc0730a5e23aeb516a10fbafaddd132974c58bc932ac6818a079b48c96eb841325286ba1da018e SHA512 52b7e8d3c25a7b61229457e84f19efb6c0882f3c8cbdecad6133d0c45194b91703774f119f32bdc9283600d4ab179ef10afee8f49dbc6187792a3f7db1a97959
+EBUILD django-tables2-2.5.1.ebuild 1084 BLAKE2B c2ca226e2cec04c762ac396b478f05ac69a9e020f8d14a712f2c6ceb6bb9aa2804a72264875942795a34b5a6f20c6e7ccd4eff369b4e952aff03fad7e9b4bb1c SHA512 9e983a633e4822b3e1de823a657aa910b11ca3d3ec62ebd5d7ca139d93b484b6d1ca0cce5dbf7941277483f271894ff677311f6d46ec0573b7a5bcaea591245c
 MISC metadata.xml 391 BLAKE2B 04f9dfef34c08b992fa0068be666086826cc68a5ebc7988aac9d434e45d2566c183e1f7fc87ba7caede99f3b369ae0e41948f50621148e53cafd8349e2f4be38 SHA512 442aa71cbf9a8d352fab88e03f754c888dc3d866f2c467c3e4dff99a9464119d6d12bafc61c149325b16a5ef868579665ca680bc360904f6e06a6b27b8a5f1e7
diff --git a/dev-python/django-tables2/django-tables2-2.5.1.ebuild b/dev-python/django-tables2/django-tables2-2.5.1.ebuild
new file mode 100644
index 000000000000..148dde53f147
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-2.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="
+	https://pypi.org/project/django-tables2/
+	https://github.com/jieter/django-tables2/
+"
+SRC_URI="
+	https://github.com/jieter/django-tables2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/django-filter[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# these tests require tablib
+	rm tests/test_export.py tests/test_templatetags.py || die
+	# these tests require fudge
+	rm tests/test_config.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" manage.py test -v 2 tests || die
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 5f6c5587b891..234f3e18016c 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,4 @@
 DIST python-api-core-2.11.0.gh.tar.gz 187535 BLAKE2B e8029b6344b572e1dcc8455b95f3ee63c8d3684f0c8807793e4e6ba2dd0179c939f183144085c2b94a29b8a1ae0e39aeffceb632988702806665ec39c51e3ce5 SHA512 798ff3970027d7ce60dcb62a88d395ebf00454f902fda4f272fc240b9ec104af112dd9de479fb6761990c48931c8ccd8c5223a1b2b5fa44823cabac862efdba8
+EBUILD google-api-core-2.11.0-r1.ebuild 2111 BLAKE2B 2fe7fc2b0df57447593d1cfcbf9af41173736708354eb53f07ae2525b14c58ea1d8d296c2c8f6dbc9c1d71c2b94cba07788dc0b31d78ded06ff4f26827d3887c SHA512 93b3cb0997b5f3789a76e76d6a42800b34891644e7f6126871604fb532acf25145f85f841bd0175e49d4d5bdfa60ca8fcdb8fdc39c8f1336ea8e2c81bcdda04b
 EBUILD google-api-core-2.11.0.ebuild 2116 BLAKE2B d770e30fc0caab82867b5ec1503a3444127f1d67cd26802833538212cb98b32ca7a44f53bc39ee0efc86ede2c0627f3bfbfbd5cd1f773316a725f0174be52fbb SHA512 fd898807704698b6d69433c873002691d09319d6ca0a2d9c1fcbb82fa92e3998e49fb1f12def26f48b27ea6a1146d185251efb5e45ddc15c97017a6f8af99fc2
 MISC metadata.xml 519 BLAKE2B bf6ee9b3f0f7fe5fbfa5461aabf7872c803bd0483938da629ed6468017d82ac5b8736a52ef325374d7948a752ff1cfa6006aca2e833721f5a4a47f4adc5d8630 SHA512 d56b0312f5e5b5ba909c84af358bbfea98ea4098fbdd0ab562e0669a87a492facc05644d13fc38a196e1300f4cc1638b28cdcd10f412d753d71f8cf20a7fec62
diff --git a/dev-python/google-api-core/google-api-core-2.11.0-r1.ebuild b/dev-python/google-api-core/google-api-core-2.11.0-r1.ebuild
new file mode 100644
index 000000000000..ebb0ff43ac99
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.11.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 42f322e63865..9ca649f4e2c9 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,5 +3,6 @@ DIST google-api-python-client-2.70.0.gh.tar.gz 37420341 BLAKE2B 8bc148c2cfeb1be5
 DIST google-api-python-client-2.71.0.gh.tar.gz 37887241 BLAKE2B 5b0e8f39a4935f6e64e1846b7457e2fef62f91d8b62debd277dd49fe28242ffa6d1f8bf8962b56860448aa0edd8fe23d102062809995b212b775c760d20b403c SHA512 a13e31226991a77f900e87f72232d6722dc34d3b7a0134fed3039a5439d207ee26a3f9caa8b4cc5319acc864e11f07e080c0cea25ff29ab1a775b49278582c83
 EBUILD google-api-python-client-2.68.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
 EBUILD google-api-python-client-2.70.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+EBUILD google-api-python-client-2.71.0-r1.ebuild 1439 BLAKE2B 9c0f725d19df30b792d44e65ec2220afc2b475370fdea43436787eb9b8d32b8b8fb2ebced9207a3a6cd880d0571f4373f079bc4e17a0bddc45ad1ef31a200989 SHA512 5fabbb0362e61e102d11536b900b99debb8053ab397f795a2e9e2f17ea342e4b3e97191d464c1a1683844ed16935df019de1e9221db32f9fccd7eb39f9535e3b
 EBUILD google-api-python-client-2.71.0.ebuild 1444 BLAKE2B 83f05fc39ec4a3a0048df114068d4c4aad4a6361a8bdc7c8d83f55fe2f925795f343c31941622e60654d179a5b6d7064017926e67ae27e17c461d6a472d3c618 SHA512 91fe171a68bac4e641c2a36b9e1133d6292bcb5adc9753f765da800b0528f96f1f2f6e77b919843e3a2d0c7b5b8abcf4f524c11db12e7d8f9b5c1d4204e23a54
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.71.0-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.71.0-r1.ebuild
new file mode 100644
index 000000000000..73c0eee57b5d
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.71.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index 8b643388c081..69cd287288df 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,3 +1,5 @@
+DIST google-auth-library-python-httplib2-0.1.0.gh.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
 DIST google-auth-library-python-httplib2-0.1.0.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
 EBUILD google-auth-httplib2-0.1.0-r1.ebuild 904 BLAKE2B 9b79ac338c6dda59973e0f44c2be00bb2272bc0cdaa20af1130728018fddccc728f1eab1baa25bcce7fffc0d81fdd494b3c3fbffc3ebf8391f1e67602a60d67b SHA512 33d1f59785aa5a36b47117f3778f83ba7cdac47030816e0dc9680127d07cfefd2f9b8cd008db0fd9d18a1f2b9ba72c89e897aa816fb5b918eb75f6af3e5cc286
+EBUILD google-auth-httplib2-0.1.0-r2.ebuild 913 BLAKE2B 39050d32ea17f753728696c56c3c641045459e6176dad0b6dd387a315e43b442152fb42ae8b2f46b889830c32d641a8d688b23eac2133ac3f96ceee5a6263125 SHA512 fb7dc06d2a66d82fcd63334656bc43212bd5866366a2d3f464f3ee2ddc900444d6b0b8e3026edd4ae52d7abe782033ef76f057c30e48f4d8b58a13630b657ddf
 MISC metadata.xml 539 BLAKE2B eefbb5db5d696a71dbc67ace7becb705ac048632e0434e516aa2fbc6e963ea86713beb4b1a2109e29e16b9844c2bf62ebbec527379c13f0f390d2cdae23e77e8 SHA512 03b6328fffb6014d3cccac0687e2b652b5522f345c125ec69c62dc020a8a6baaef444dbdfadef6dd8119d1a19449d57893e207ae4f2ac35d5592c23cad931c2c
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..74cd7713007c
--- /dev/null
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P="google-auth-library-python-httplib2-${PV}"
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-httplib2/
+	https://github.com/googleapis/google-auth-library-python-httplib2/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-httplib2/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 5c353144b92a..4ed27daac2e5 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -2,4 +2,5 @@ DIST google-auth-library-python-oauthlib-0.7.1.gh.tar.gz 70325 BLAKE2B 969b6de0b
 DIST google-auth-library-python-oauthlib-0.8.0.gh.tar.gz 71774 BLAKE2B 100aa01586f5df18453713610f3ed954a196e3d0c8d4dc15b8a67335951cbc2eaa15e3fa4bf7c7ba161418550bb7cfc68630fca0efe697a9c65ccbd7e0ce05d9 SHA512 3090d9b3ad25df6e8151e49a0cd96e7226aac2cecbbf289ccbc8cf4704ec86d882c11546b26f3a2ba9b047c19408f0cb939b9caf489aa935f49f8990ab7bfa55
 EBUILD google-auth-oauthlib-0.7.1.ebuild 877 BLAKE2B e01c55a12bf9897a5df0d230a0e9d9266b3de3a1c2c6b1a5623bc94f46c5ab5435a6e26acd88fd5bb952bfb7a68b08d7fd56948511852fd4b0587519014a29b6 SHA512 043abcce2d9143bd5c029b9eb7ebeb006bcc4153f7d2adffccbcd2d381325432d76cfd6d553c4dc0f25a760944d828ce3b10b2ed80713df6dd256f5dbcbe3542
 EBUILD google-auth-oauthlib-0.8.0-r1.ebuild 877 BLAKE2B 6517855ba3910fff7fded1e9983fe7ae41007011326527cc24f6afcb88ec6eabcfc027adfd482a03d172647af09d06a904c27a90502c86bb1465777eaa8474ce SHA512 a0e2e64b63e27a8afe3cbdca9e3b854604f75a5498274c07732b753b891215957ad8b66376bab3ea295d858459ee694c74e9231501bc1869854601836cf67a87
+EBUILD google-auth-oauthlib-0.8.0-r2.ebuild 878 BLAKE2B 7516cef25ce2af84ea44bbf16a87af1399f7da90296c0549f7339b58a50147ca6a3a4bb7dfd11e9cf115872d6ad6b44c08baa76544e26a7f1cf348a9a82a0e5f SHA512 e33125b63875d02a5267017ddde5ca894901c6ffefed2c821237e0ce3b5cadf5dee0db3d9cd871d3398b707331a4d40fdec931fa8ab47d56afb3916640cc4732
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.8.0-r2.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..428011855aa4
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.8.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 83588d3b6e32..acdc0c8e7745 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,9 @@
 DIST hypothesis-6.59.0.gh.tar.gz 9337749 BLAKE2B 29673a769702cf80efa05c3f5a60a3dac6d1226db2afbf25e3ff71be801c396db843222dac5facff8bbb1105dbd7533e2e908188a611a6e051b757ef87498dae SHA512 8d189576a45dc527c2adc0b36781a9323292aa3ed61ab1e0747c379d170c8a1907b787889ceb767d4814422d158c3cdd542360e75295605805b22d832a999777
 DIST hypothesis-6.61.0.gh.tar.gz 9340090 BLAKE2B 0d550e50085ad2e9ae848b86b35eaa229de9aa461e235748c308708e92f22388ca1cd5f663f68d8399f89b73fe20298653f947988b6fb2c505ca44650c3997d4 SHA512 3b460c817b46a61e8bcb506316cc56a6e70b7cb16e1f7af925d24372992fcd8c7c6895722d11637402f67eef0fad63318c5c8835e72b585c789e95937cd38465
 DIST hypothesis-6.61.1.gh.tar.gz 9340617 BLAKE2B cdef4559eed21211ecfb3942575b3a9f83e8c2335443d5541e1f52e839a41755d18d5174c1041f12723a26100c6188c618acaa7f504f250132e53ca534c36be1 SHA512 1a0093f18ca3ce4507926c82838cbb205b012faa47f5b4c1b8f574cfe9ebfd10d94d673020212922d162ee1238ee2a09d20b596e9c81ba4a106dfb4e2d6692a0
+DIST hypothesis-6.61.3.gh.tar.gz 9339977 BLAKE2B 2bd7f2828563694f678eacc3537e920d027229d294f1d48ba23780d8a467ffb2829fd961ba4e002786f5d95e4b57c6d0c115d75df8468465f31f3512c7fcbbc7 SHA512 835a079570a983343f4059c7b6ca5a8e8d568ad945a173bf179f6ea4b1ac6cf7d1f7ab7df8092c18aacc455499a9aadd0803ac3b0fb800c4d880a16256ca12f2
 EBUILD hypothesis-6.59.0.ebuild 2132 BLAKE2B 46f1d1c0f69606e55673a002c305f72655f44ac456ea0e8cde03e7cfd12a074d915f00b29280637b150a4faa596dcd28e2527fc6762aa53893f245530c5a7eef SHA512 bb0602862ac4175e49605bb095ca8d9a027a964cda6e0cc51f03910f5186436646e25f25621cbfec777dbbf0e5fbb4f7a5a01ef646fc20bb84f75980daddf1b8
 EBUILD hypothesis-6.61.0.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.61.1.ebuild 2140 BLAKE2B d0fe7a1d10483ba5c59ba3b9e5f1b5048369426bcfcf3dd0bf57355da3d0910cbbf3c8eb73641b4389d5c0ef441b885bc630fe1f83931b3fd7996021006d074f SHA512 e310cf405833a1f54eb46e2c360f4b5bcdaf4618afd847d1b7c9b015b36c1daeebbf1284371d2cfd749588c389f660f2bc450534a1555d4253ad951fb3c646de
+EBUILD hypothesis-6.61.3.ebuild 2140 BLAKE2B d0fe7a1d10483ba5c59ba3b9e5f1b5048369426bcfcf3dd0bf57355da3d0910cbbf3c8eb73641b4389d5c0ef441b885bc630fe1f83931b3fd7996021006d074f SHA512 e310cf405833a1f54eb46e2c360f4b5bcdaf4618afd847d1b7c9b015b36c1daeebbf1284371d2cfd749588c389f660f2bc450534a1555d4253ad951fb3c646de
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.61.3.ebuild b/dev-python/hypothesis/hypothesis-6.61.3.ebuild
new file mode 100644
index 000000000000..6b7a8749c0c0
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.61.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 5194c87a642c..b7488e54f61a 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,6 @@
 AUX iniconfig-1.1.1-py.patch 1152 BLAKE2B 34950c2d5330d2cd40d1bf1cbd5d70d05cd3e84e0803d14c24a060a127ed87ebeeadf7a3d6308ae5b6842a38c3476212d28eff08125f87b34f33e5d03bbc12f1 SHA512 040c41d1017463db7276fcf16293b11f05477e5f36e49838d6d8a2ae0baa0755d533a938dada4910f6c9216c9906433f11760dc4e972cc9632e5d0b4838f493e
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
+DIST iniconfig-2.0.0.gh.tar.gz 8077 BLAKE2B bb24006bafed64bc28d7a784ed24663dbcea782ef241b9c7ccb5dc0268f6d6ce149882155617d4c021805457c7c5e4775437d267da6905266fb84e877f16e09c SHA512 e474aaa904070ed79dbbd2b4b572574ebb591b97a4ca0f9c4e4aef437af01035d2f73c48bb670afcec2cd8b7ea093b92d6b0c0eca7ba42033418a2b0e0ac80ad
 EBUILD iniconfig-1.1.1-r1.ebuild 758 BLAKE2B 8842e2ef45004fe1b2dd5e1d8e24c1c3b58cfafaa525f8df983216de919a7fb1487e8afc34ccd36e7f5563a082f4cf9b802abf6df98df0f6aa3b6866b1a1ccc9 SHA512 a3766b0700a872c36fafec4ba4eb05e5ea64249aeaa8c8671cfe0403dfc493e1f7986773dbd2943e14f187fa236c059df146721f48284c12c28208433e8a642a
+EBUILD iniconfig-2.0.0.ebuild 807 BLAKE2B 5056257465fe2f00a1d02768e888b74506982e4f3f3d7feb1beab72d08aedc898e91c1d99e7f750fd6f69b3521cafdf882993094ed8b8ed9597b6dfd451149af SHA512 b1c7374969bf1a4131d5f430beebded70e53f2e1d4f69fed3b881db1e29677cd7eb1a139e5bdbc0d4019deb2f4aa1ab235347b4a0757bb5d2a457d1ac4d900f5
 MISC metadata.xml 375 BLAKE2B 07a0e2560e140c553289626437b1fbc46653a33cf9937775d60e6324361387d8399dfa3298ed8702a9532e55e4383e7493e7530be6586abbd2c5804372206627 SHA512 24e5acfeedf11f59184106a7b09169222761ffcd960ef398bce23acc3e63291b4c30230804a7da6b96a9799dadea5032d7fda7e7705577e1c6e9f8728ed601d2
diff --git a/dev-python/iniconfig/iniconfig-2.0.0.ebuild b/dev-python/iniconfig/iniconfig-2.0.0.ebuild
new file mode 100644
index 000000000000..21bdc827b254
--- /dev/null
+++ b/dev-python/iniconfig/iniconfig-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Brain-dead simple config-ini parsing"
+HOMEPAGE="
+	https://github.com/pytest-dev/iniconfig/
+	https://pypi.org/project/iniconfig/
+"
+SRC_URI="
+	https://github.com/pytest-dev/iniconfig/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 5067df8004ae..9c17409f6422 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,5 @@
 DIST apache-libcloud-3.6.1.tar.bz2 1944060 BLAKE2B 61e1481cc8e4e3e017c262d20666ee33a79ccb78bbc0d682dfe6f63df26f21c06897ec98b0df56a27ac6ee92922a08ecb98451c1680c323f042a497379f91090 SHA512 292166aa1eda4b31eb1552c91d9acd54001c363471f1fdd5310e3e25519d7e1f599d9566f55a0c10ece08d544774e1abca3043283b1e7dd93bfadb7e36b02e22
+DIST apache-libcloud-3.7.0.tar.bz2 1979020 BLAKE2B f8630a5c559cba9ae6f7792ffc9cf4ba6eb2fdaa28d6ae148a5d2e978ee66eec9a39b16741446b78b047bf2454de860148a13bce3dbd8627dbc7dac43543b808 SHA512 315866947d2c748e4a13c4c2a4147a2a8e79cbb85e9e83fded3f89ff8a50c531acf1062a4e21c61448c20e7f7e7f9d1317d3c43ecfe2fb75155c0d81ff03f889
 EBUILD libcloud-3.6.1.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
+EBUILD libcloud-3.7.0.ebuild 1529 BLAKE2B be71299cc2ace0b86e8c40251b84f4a41cc9fc9bb6bc31cff5f31c7c44acf6002231a3020d3cdc3b3c060a23605cd8ea07d3d555e5a6efd7aeeff1d3d3258677 SHA512 76bf9313ad9500a7279f59d2d18a3ad84a448003766f6e014b92efbad78ff3ddc1de6e1efd3c5a72cb10095b35c0316b2e324ed89962e6be6db8c17dbf00f08b
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/libcloud/libcloud-3.7.0.ebuild b/dev-python/libcloud/libcloud-3.7.0.ebuild
new file mode 100644
index 000000000000..043e8d489b1b
--- /dev/null
+++ b/dev-python/libcloud/libcloud-3.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="https://libcloud.apache.org/"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
+	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
+	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
+	# TODO
+	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
+)
+
+src_prepare() {
+	if use examples; then
+		mkdir examples || die
+		mv example_*.py examples || die
+	fi
+
+	# needed for tests
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	use examples && dodoc -r examples
+	distutils-r1_src_install
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 886a2bd771d3..6250e73c2881 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,7 +2,9 @@ AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370
 DIST mkdocs-material-8.5.11.gh.tar.gz 10423819 BLAKE2B 8af9b10fde57a6543d86dc8d6004cb100359e274072486094e7db4f8eeb7d44d83505d00b3f202f02e695a613ae8e2fdf08ac1b39584e7d9aeae430bb560d60a SHA512 7fdc06cf7f64a2831fe2acb05a735bc9519fdf109fbccd5ee1667d07175916fffb295ccfa88a4352a7a0688f0eaf535c26ab49463f672d964d4a87ad8de6ddf1
 DIST mkdocs-material-9.0.1.gh.tar.gz 10585027 BLAKE2B 7515e9820466e375098781f1bdcdb56f6f9616ef827fb307fbec2c696d28923837df8a7a93fb4972eaf8de82411c5287bc6d40e9d0e91f0a1f109e4ee35c7771 SHA512 800f02a9ec31e9505ce9092abcfb2558bf9edc2423c844f0acadb96f190ff858df3a74a704081eea8c1eec2851265d22b19a7d8d7aef49d3582f2c7ea05f9d60
 DIST mkdocs-material-9.0.2.gh.tar.gz 10585323 BLAKE2B 2dec935eddcd3865709f9d571a6e7e13774d88b7960fd1f12e1bfc3b7b70c996ac1b6e7d6da74305a693f0104ebeb5ac4b1d9d84682fcc0195346713b014a663 SHA512 fe789f02e306d7279d2b9e3c2fef0301791bc9f109df12a217a42d4334c891702472a1fa28a98741e670a534963175d926fc76f725cb4f56be4d3f49906ab4d5
+DIST mkdocs-material-9.0.3.gh.tar.gz 10587701 BLAKE2B 35fce28b42346cc2ce208cd3ea5d89437a65b0ebbb8bde2eaae278b5fa7da222a025f34cbf8b3212da206616945ce57ce23d9b2061f216f5b2bcde9e23c96989 SHA512 dd81508dd7784318ba0cebb2254891bcddc6283d5a45c04d956c5dca4e993d57e2059aa9f0dee5667889673515c1af2681fe907b92aebe18f69483023fd0d6d3
 EBUILD mkdocs-material-8.5.11.ebuild 1263 BLAKE2B ade580f1921daa471e69a1711c5ba95adf8dd83eb385852c47ba0f1e66dff80609ba0cf0b81bed2a8afbf7949ab4af5bb753930a6a14681d8666e3bb26748d50 SHA512 e519986187741ad49b74001d89f84f8dc70c168f5c0887f95837c328e7d8b4804bcf6f51abd2ae55e3fbef73ac04ddedfdadca0c3a460b7bb1cf7ffb1463ae7f
 EBUILD mkdocs-material-9.0.1.ebuild 1265 BLAKE2B ca28aaf9da56c2d798762bbec2c5b613238082b55e5d411464667441c929fba8725c761c521fa2603ac402ae9bacf7cc51a6806c5de28f67d0eb87e188180c68 SHA512 3d40c67bb845df0dc4c0f1bdef6a78dfb9af93119b7cdde13cdf4eb712c94103226ad2ae4e2c2b9ea0502e7b903997330a1d047d0f01e3bece8e576d81804d62
 EBUILD mkdocs-material-9.0.2.ebuild 1266 BLAKE2B b41ac1ba555b89fdd0bedc4982f3c29ee1c2ab9820cc60cbbc7195149c441624e839cb7e1eac4721999776dda64c7323cc46ba8aaad388afa8ef8685c8598357 SHA512 9d38b2478588f8b05930d4f013278785f848fd0d4ede6996966884c56a37c2dea7eaa18ec78267004f25502df44a3ce5b586a4f41ca54db4d8a21b189d673c92
+EBUILD mkdocs-material-9.0.3.ebuild 1266 BLAKE2B b41ac1ba555b89fdd0bedc4982f3c29ee1c2ab9820cc60cbbc7195149c441624e839cb7e1eac4721999776dda64c7323cc46ba8aaad388afa8ef8685c8598357 SHA512 9d38b2478588f8b05930d4f013278785f848fd0d4ede6996966884c56a37c2dea7eaa18ec78267004f25502df44a3ce5b586a4f41ca54db4d8a21b189d673c92
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.3.ebuild
new file mode 100644
index 000000000000..9852c1d467df
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 1eee37d69817..6f8271ca56cb 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,3 +1,5 @@
 DIST networkx-2.8.8.tar.gz 1960828 BLAKE2B 074e902c2c31e0641fe651d2168c77e62af04b322485bf002f557a42c7a7c63d1391c32f9de95b9d5faf13f7eb9ece93171bb1fdba8548d59df5075ac72263e2 SHA512 c698ed2dcc4221662af585940cf5d6ce1ad97b6b8f6d84348ff1d6b233eb69a36f5fba362bc4bb3a08ec8716434690b52b1d66dc4122edb0f420eaa10023d9d4
+DIST networkx-3.0.tar.gz 1987075 BLAKE2B fd5de216f4934a1d5c730264b3860a91dcaf7a12462b615b1aa22df11bfd7d530a369442eebe185572e94bedf6fae3ef4a452804c84fdf3f1e79527ffab2d5c9 SHA512 73e1a9faca6ecd04f6d8da4cd5a887af31738fbeca3d06adc57a4a61fad1d81ab30e89f9c4d25274b0890519b0a517f09402eea3bf3f26b18c3e3052b837ee37
 EBUILD networkx-2.8.8.ebuild 1883 BLAKE2B 4af4806dbeda012c73e3bff348ab7e802eb250f28806583339491e0e6b19234b9c603b53671dbf09ea22680b1e25ac9a60a4b282a0558130b322ac5d2a4f1062 SHA512 e0f286b787fbe2eff2a1c6efc7de6340b12e294f9138af5c6498e9d0bb2a580275c8bddfb9e7ab0f567360b009109f643000cb96fab80d16be2d6dece4ea67e0
+EBUILD networkx-3.0.ebuild 1887 BLAKE2B 198f239aac8ce89d47260381cf373d5f7b36a9d3a6e0cf71f9a726037832f37a2466256f712b4075e9e70545fda761d4965228d73b217394117ff6a16d421ac2 SHA512 fe5812647cba2d7dff80eb7bb11524acb980c26139ea6cbaa647997832d98058c03b3f495ca1c56b6bcb94a2235ec73b3436a0ecb9f492691dc55048d2b420dd
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-3.0.ebuild b/dev-python/networkx/networkx-3.0.ebuild
new file mode 100644
index 000000000000..400f0aea381b
--- /dev/null
+++ b/dev-python/networkx/networkx-3.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
+
+inherit distutils-r1 optfeature multiprocessing virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			networkx/drawing/tests/test_pylab.py::test_draw
+		)
+	fi
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/nox/Manifest b/dev-python/nox/Manifest
index a56c0caa4f17..e310d344e068 100644
--- a/dev-python/nox/Manifest
+++ b/dev-python/nox/Manifest
@@ -1,3 +1,3 @@
 DIST nox-2022.11.21.gh.tar.gz 3983862 BLAKE2B 9c365dae5415de4c43c262a1ec9c9007b686838f8aff92a049b1602efe320b7644677646ee72c0e5754efc79d6e38cd46b59ff2851b39b4bf05d3166625000d4 SHA512 7f725425acd7d1ef55e04c5330c1f4fd2f2f5107c24b4bb7f7e2711cf6a5c1b8f2777a4902ee31d4a56898a953f3da6a9ed340d652fbc63cba33f5f763702b78
-EBUILD nox-2022.11.21.ebuild 1017 BLAKE2B ebec5dd9569319df2b1cb4d7122f92e796abd11dfff093c7c1ad8e3689c12bbe05f1feec9b20fa4c75f90e74fa3bc2d4d934ebc818e6eb72c3a2a7e82f2f205d SHA512 ce0fe5f05f3e8b766e12ae119921327ed7848018221bea6a7970dd5b2cda8c1fe0c1af3858b4117e4cb13ce80f36f65a20c313008c0993ae2d59d56171f82f0b
+EBUILD nox-2022.11.21.ebuild 1075 BLAKE2B 4999ff9562a67ca80cb3a46e1f236020d44bf289b3224ec51e39a43e409563696e06b85db3d530dd002b02835f22bb817e2955560da63c1aebeccb87782c4fb9 SHA512 ec12a2699879dec644984d8609d0105b181088902e8ef1e78898e70aec3c0e90bece212a17db8afb5d79f28eca9f4ff577eab3021400d9234f5249958bd16f5a
 MISC metadata.xml 382 BLAKE2B 52bcdba99198ee70c06bcb2d118ae3d92f3072ad7df91433670b6ba14ca76489dac5b275780d11b1052e19a1c03d5021f42ba75c3d5e236f1e028c54f19129c2 SHA512 9fb9741a9920cc7537180b07f2715e40b058c5fd18b74e030c0cc598a46dc5a72b227982a11e39fc09dfe200b3cff0a4c150436709c86cb6e44508e412d364b7
diff --git a/dev-python/nox/nox-2022.11.21.ebuild b/dev-python/nox/nox-2022.11.21.ebuild
index 1047e05af66b..8939edcc5ce8 100644
--- a/dev-python/nox/nox-2022.11.21.ebuild
+++ b/dev-python/nox/nox-2022.11.21.ebuild
@@ -30,6 +30,11 @@ RDEPEND="
 	>=dev-python/packaging-20.9[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-14[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 465fef4ef188..03924946dbf9 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,7 @@
 DIST prettytable-3.3.0.tar.gz 54305 BLAKE2B 4d131c16b6c6a0fd64aae1f9f54e286bf27b562888af56a6944d192a24c05d6138c3bdb8f298dcc060db7609d72b8d86ab9664bf6bcf43cd2105bdd433bae3cf SHA512 e190717e2ea89e8faddc7015fd5118e0d93ac5f5318641ce5960b22b4ea3740ff12c4d15812b33655252f258c96f9e848f554d1e678d39761c28025ba7772609
 DIST prettytable-3.5.0.gh.tar.gz 45387 BLAKE2B 0ddb2c89e80c8f713c01afd4db7d5fcfa8151bcfaf7dcf07d66898b1b868ca093931829fe1b4db96c120a6eda1f84580726931dbd6d49b9870c1fc1eb0e479b9 SHA512 24ef28a42365568bf68a974afd42fcc1bfb9208e1cb75fc1b2890bc2253487afa6536e778b58e320e952ca8bf9b69193bd1293bb7615628d03765ee24c44edff
+DIST prettytable-3.6.0.gh.tar.gz 46174 BLAKE2B 2a7e507efdf4ab3282e95e8db14b92477fdd40a06fdb009146ce6a3a52ef49e46a61803ac3cd85d2ec993ad8cc49bd842d438b97fc037e56cb33cd4495b535ef SHA512 b4693a3d30555f598cb955923560d02ce7c757e87ee49bf09c8d50d3ce8bef67ebfad1c780914f488e89852c0e363c2cad098addc058a88864efb8eefa8e9cd8
 EBUILD prettytable-3.3.0.ebuild 782 BLAKE2B 3dd7611537257743e0bbabab911a2aae4be5e1efbe5f6d0e7fd60b39099a02c4b9219efb9d289398e0287eb4e1319cdd31b544e7084aeedc2017d906d66430ab SHA512 1baa694913f1cdb9fe99ef332cef406631421db174f5c97dbe5dbfb963005931e43dc5eef61fa23717b5a90831bd98dcd2092b12cba9a84595e90ba4fbdcc5e3
 EBUILD prettytable-3.5.0.ebuild 863 BLAKE2B f2f0268889c71e951e3a233e16b18103fb7a6d76abf2ce480a8e7826829174eb9b04bb2f6dba7bf9429fba7b28de1af28014ae2444662b105ef9e91822e449dc SHA512 700f751a3043fff70499d8e184080310c8b35d39c81eae4d79720339e0e5db3c169a39fe4b88239bbfd32e1b1793155df5babee495e7d3244bfc08b3e43c9be6
+EBUILD prettytable-3.6.0.ebuild 868 BLAKE2B 8eaff62d8b11fea94d8e3ab3597e831d4e5f4740a4a9af40c63a65962d648cd6fbf3d035f493a055c514ce285e5b315f057fca2dc260d4d326f15358deaed82f SHA512 898c574582801bd0637faabaab87939176f4ec5ef7eacfbe3847b51d68705240b4728277eea5d2ef220b09aa4f413941d9f712c3c60ebc939dddd18ea53a6668
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.6.0.ebuild b/dev-python/prettytable/prettytable-3.6.0.ebuild
new file mode 100644
index 000000000000..53c3c61e1d89
--- /dev/null
+++ b/dev-python/prettytable/prettytable-3.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/
+"
+SRC_URI="
+	https://github.com/jazzband/prettytable/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 4ae1f02adb00..6317ccbdad2f 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,3 +1,4 @@
 DIST proto-plus-1.22.1.gh.tar.gz 69507 BLAKE2B b71c263270dde979da0e050a21db258366ca5ddfaed5f8fb78e53444454a123d171019801873d1662ca73a89f079fa1c4cb7c58d34053cabb528015c0d742183 SHA512 2fb5dcb6124d6e2aab010089f4ad138de5cd819d4e67c2b9a6d7044a3d7677ca6e5e37e9aa0ee9edb262c52724dfd2dc05592c489df66d3cafbdf51f13644c7e
+EBUILD proto-plus-1.22.1-r1.ebuild 912 BLAKE2B 5f07367e3ba3125c7ad203df47952c8e74a34ecbc5187af4fcb6a9c461836346caac0d0e929af0aca07dd142d04c0eb9ab5f6cadff62401db9965ed11c3c0b8f SHA512 aab7691db7e4e8610d8d22d7dbda8f7b8d07bd3f2779273fd96e5aee6ee58bf5c95b9a12d2db6e9544f8e932210b7976a18410c740c3d357eb9a033fdb8392eb
 EBUILD proto-plus-1.22.1.ebuild 917 BLAKE2B 7ebb9724e5e0fbfe88b3961912eea64bc61de0c47528fc34a4140b8d52a6891d5973bec31a46683690cefac235498ea55a45163ac5c7152bc479fa387d9913c6 SHA512 71e6499479714996cbb506f120802fc4ac1d437866c96df42a1a3515d9e30905ef25cfbfa2545a05ee015e106cefa962d834a2b76aa7532aa33560cba3e7411e
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.22.1-r1.ebuild b/dev-python/proto-plus/proto-plus-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..a97f156bb73d
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.22.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 6727535dae31..3dff94933650 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,5 @@
 DIST redis-py-4.4.0.gh.tar.gz 4637656 BLAKE2B 40b0909c27cefb399353cc2d1d82d7ad3d64e4b3e5ae001ffef9c198d0e65d906f5772a0ac33b599c7fb6ffc5dfad461bb4b9042c5c4fb23dfbfceb0a7facbc0 SHA512 8992f160de7817c48893f3a8588d5c0398dcfb91830a61b4218206adc88185acb102b072507d3064b4a7aade5c957267e5d0e6912510bb106eea834cf9250fab
+DIST redis-py-4.4.1.gh.tar.gz 4733306 BLAKE2B b04a5925f87d8c1dbb06b30382f739d6bc39456b6b49be34701afcc1fecfca4783e60a451ddccdaff31f28c38b626e19607a57ebd600f7e28c63a4b62894f397 SHA512 0cec4b518bb56acee6a24ca62e7fdce054b4be764fcfaa860257d8de9f306d9d0f15a662354d7414a4a552475e2b49d97d97de05059310eead068a6269bc3038
 EBUILD redis-py-4.4.0.ebuild 1741 BLAKE2B ff2e4b6cec372b495f8e9151dd64d1d53ce01e8e67546ee4852c24960987c14f5aac49c938cd8addfc4b920008dce12ba8976f7c72b3883af41bc7e8f5dbb472 SHA512 40fc7d02058618f1c4e45a0879be7f2f74795fec909af1c6707d51ca1d53a76b949b5d4799d331473e30de56f37f99c67f33831a5aa2045797f3ba4ae0373a5f
+EBUILD redis-py-4.4.1.ebuild 1748 BLAKE2B 181171f8769e70a8278344b0ca14119f35742b469179dd9b847c3d3cb6854adb76bb15c5d9db0f7ec983483cd7c3cbd58d97414c520bfd1aaa21aa651a06b99a SHA512 5ca7c4dd207a04a3c4f7eb4da41ca839b66787868fc505ba8a5ebda2e4b370113df2cbfe6df3908a2f4267640c87a3a318bffeb0d30b8f50b15c2578d10bdf19
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.4.1.ebuild b/dev-python/redis-py/redis-py-4.4.1.ebuild
new file mode 100644
index 000000000000..cd0794a5536c
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.4.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# TODO
+		tests/test_commands.py::TestRedisCommands::test_acl_list
+		# redis-7 different return
+		tests/test_commands.py::TestRedisCommands::test_xautoclaim
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index d37ce66d8306..eda1a3f5d632 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
+DIST sphinxcontrib-applehelp-1.0.3.gh.tar.gz 20624 BLAKE2B d9dbd5974527044ecf2d5800da1a3e4b169fdfc2f322006c56ff70f85f3690c95f7f1161693c3bbd14c90a76b8e64035fd3f5bec1529a35f723ae0a47c5967d1 SHA512 d790a58a0b95f90f370c80d198f0e4181485d522d4dcc6e03874c2a2d53b20f84770507a0c956610135d1ad85ccaab68cb287b1e1c463d32c5a0447a5ae49f45
 EBUILD sphinxcontrib-applehelp-1.0.2-r1.ebuild 974 BLAKE2B e90432e49f407f7885e4deb454c83720370efeaca2bc1c0bb5be3293fd7a839069961702f09109c58f9650ab641f24430e7e143cbd0980082111823e3c4e4e85 SHA512 39ad8083b2ad9491713c3ef8f4034e4191eb98e7f50f437fca94a63a7b4055ab265a638e2a733c7086ca08e8ac0ad18ec1e0819872a88fd827a27025bfe947a5
-MISC metadata.xml 425 BLAKE2B 69f933f9bbb268736b6d99ac9256c9b2a5eb53259e117a2e02dd5b2d284d83b947c9e58fee62f4b2bbf1446829f337319fdd4c1f703d6f6c84a4ca5799d141cf SHA512 76f9a4483e7899eff96173738d4c116988fbb64852a306359649dd882abbc6b574e685a7947e4636f517aeb4b4ff56a9f8f84d9aab8da63c45fcaced3ce1aa15
+EBUILD sphinxcontrib-applehelp-1.0.3.ebuild 1032 BLAKE2B 04fdff9a76ae3faafe9fb905f6d2fc611951f2f5ac17b038d563abf656ee3058a9b7c3eb613924a871f4c6f56971210766f965de456452c7873cff144a27e985 SHA512 c2d4c8fde210a12dc3e2e6039ba13f12cd5cd66c5c044176f6b9a23418d04143bb2f32f571e06c72e80419f9ab52834d540233a7d0902a4c0d98dbf4da3f13c2
+MISC metadata.xml 425 BLAKE2B d49f916b89021b1ae52201c71eae93e0c14dc61bbfa0d510b8269ab380be5da1889fad80fd43d5368a753d4f88b7430d03f05b4450926ae81b53a0565f4ac5a4 SHA512 85496c8832998b9e010ec8e7f2c66f65303a0bcf13970be3731508633b2be660d0758acfb96b7340a4b46061e49cd77cbed6acb5760e815a0d895f0e0593423b
diff --git a/dev-python/sphinxcontrib-applehelp/metadata.xml b/dev-python/sphinxcontrib-applehelp/metadata.xml
index 31487ef94bdc..f62d98c651ae 100644
--- a/dev-python/sphinxcontrib-applehelp/metadata.xml
+++ b/dev-python/sphinxcontrib-applehelp/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">sphinxcontrib-applehelp</remote-id>
+		<remote-id type="pypi">sphinxcontrib.applehelp</remote-id>
 		<remote-id type="github">sphinx-doc/sphinxcontrib-applehelp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.3.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.3.ebuild
new file mode 100644
index 000000000000..995319a94360
--- /dev/null
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension which outputs Apple help book"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinxcontrib-applehelp/
+	https://pypi.org/project/sphinxcontrib.applehelp/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinxcontrib-applehelp/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+PDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${PDEPEND} )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/svglib/Manifest b/dev-python/svglib/Manifest
index dd9392d5cd6b..2d7aa67194c5 100644
--- a/dev-python/svglib/Manifest
+++ b/dev-python/svglib/Manifest
@@ -1,5 +1,7 @@
 DIST svglib-1.4.1.gh.tar.gz 1265260 BLAKE2B ad4d6a402cd56e2e6f1fb534a8cc9c2bdc038fbdd01aad228d0b6471fd9781bcec88064dd6b93ef324201f141202404d25e31834c0f32a40c0a8037be7196edc SHA512 058aae53224cc590d56585a0f5e45506bd6586f70ddb3d9429052c8b2c18a3906925cd17a19c0f6b46695159eee1914f5e658293e7c40c1a7506f2414f8c41f8
 DIST svglib-1.5.0.gh.tar.gz 1265070 BLAKE2B 269a5f290c20bc8a1e5df257ba02449471daf1e9e8ec7128a2008b888c8037d8c610e59bc18d379efd41bbb2bedf265d6751b0d5e2bb34b5ff2c24a4a8f4fca3 SHA512 baa69d766b353ed4da176815a9cc205b9200d1c29b88958f6dcf1de7451d0f8f8783138ddf49aa09dbf49ccd4f36f1a3d9be3d72d7a0d1491dc61840210a850c
+DIST svglib-1.5.1.gh.tar.gz 1265304 BLAKE2B e147df6c5326f0ed27ffa56a158442b7727946cd9f51577df36b05b04ffa7ee6b8112736eab92e214ef26b7d055506844820b323e5342e04efbd615a7b8f982f SHA512 5cd93db39078c7598a51e08afee08b689c4c95e5ac6340d1a51f85b6459fa4635b8edf45add3b39d0a079f0177a99b3d4786e40fb6276aa5ba80c9b5513e6d4c
 EBUILD svglib-1.4.1.ebuild 854 BLAKE2B 8b980d7056d29a7174e92605d345cda90495febc4a9e55f3bd326f3ff44cd444bdfdd43da3904b445b3945c12ce36cc117767ce25c7401e8e7d170f33075b6a0 SHA512 4701a88800bd479183b9b84152d5ca82dbb687e76434df028a38133753296819cbe78c642af81a9040645cfad25cb27f7b2109b8f1610626c58bc6095ef16a49
 EBUILD svglib-1.5.0.ebuild 854 BLAKE2B 6fa1c795d2ea8a3a4dc48ddeb2fb080cb69a2440655c3d782f3626ff7dead4559d13b389b18bd26431812cbb5654dd3d0bc91e88a3b07dadff658ea79d1e6ccb SHA512 081a9154e7ff78a259d65fdcf97d94329345e52e2fb23f9282296ee4a2e0be6641af83782b7167e246d98b627f03f91dc68f4f16fd53cad5ee3dc412b1ddd7ac
+EBUILD svglib-1.5.1.ebuild 854 BLAKE2B 6fa1c795d2ea8a3a4dc48ddeb2fb080cb69a2440655c3d782f3626ff7dead4559d13b389b18bd26431812cbb5654dd3d0bc91e88a3b07dadff658ea79d1e6ccb SHA512 081a9154e7ff78a259d65fdcf97d94329345e52e2fb23f9282296ee4a2e0be6641af83782b7167e246d98b627f03f91dc68f4f16fd53cad5ee3dc412b1ddd7ac
 MISC metadata.xml 389 BLAKE2B a63a478393f24f78e31793e4ec841749fb600c0d4ae0b71dfb0f63dbd23fdeab7cb531f4e287d97c1b5f65decd8668cabe42eee6f1fac92f40f203a8cc500a70 SHA512 71a266a3fe1432a966fa52a691f1472f269a04e413c52abc7c7264f9acc233abe6ca86c44f35051fb960a7805c62e2ae12ec6e9799e25b2e89f401c6972c15f6
diff --git a/dev-python/svglib/svglib-1.5.1.ebuild b/dev-python/svglib/svglib-1.5.1.ebuild
new file mode 100644
index 000000000000..ee89ee4f1a3d
--- /dev/null
+++ b/dev-python/svglib/svglib-1.5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python library for reading and converting SVG"
+HOMEPAGE="
+	https://github.com/deeplook/svglib/
+	https://pypi.org/project/svglib/
+"
+SRC_URI="
+	https://github.com/deeplook/svglib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cssselect2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
+	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
+)
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 8d7dcf2e8c8e..55b4c091d974 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 71f314964fe5..711856e6d4b9 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -3,5 +3,5 @@ DIST dalli-3.2.2.tar.gz 70163 BLAKE2B 59b67fda686674ea4df36b503d7f362e052d2ad32b
 DIST dalli-3.2.3.tar.gz 71163 BLAKE2B cdb205f39dce8e7c64da808a5da8b0c295ca938b21d1a42f16a7fda06d47b11c9d357240d633b17ec140e90a1838d4e28da6333971eaad043ffd04508ffb7537 SHA512 43729fa6f7ee92d886e113c6c04f1334c74bcb189e5c75205cc955a94fe1e0d834f94b69d1e9408609f4039018417da74f9b80fc8851ed33ee3fd60fb77df224
 EBUILD dalli-2.7.11.ebuild 1580 BLAKE2B 39f0f7be69f4e765a7b1d071254b50ddcfe40a2da74eaabbec89ec4b326ff8021423fb9b9689480105e73ffc4e9dd4f1d099bd61b1cb1675233607149c80cc21 SHA512 e18919458eb72a224bd69849eb991af5e973d799873af42d97404eb8b864eee3336fb63f71d6d2cd08456d310e26cc9ff5d9037ff4d292237b54a3e11571ad98
 EBUILD dalli-3.2.2.ebuild 1132 BLAKE2B 256d4442e36531c24e028db8a384cc42381a796d7bfe0463db1fbc40a3da1307bb03f97c857596ccb670ff8732e6022800c0ef8f97292f97842b6efeddad2f64 SHA512 c2a3c411c9b40a970b3793b3d76b200e0ec8a1cd96d4cde2a04adb9847bc7b9309cfc34d59c0e212621e5b0d1df921f3576cda9cba2c032b3d94a277ec775a77
-EBUILD dalli-3.2.3.ebuild 1129 BLAKE2B 1fa870b2bab12d0257275927662076d78390467ffc28f16c57b5771abfe8a0a6a3124e13c4ded93dcbefea7c6bf054acbccb6131330d234f099dd53437ddf8d9 SHA512 c22bb487b4f3a4489bd1d2a9c1eb4635c6b34f3d6b8c7a4adb0490159116368834db333cf6f44f90dbc58484944179c96533ba9e6a1d787a028229ba3f911f38
+EBUILD dalli-3.2.3.ebuild 1127 BLAKE2B 20be6f1ae48304062fd120fac0aaefc110b526581ecfd469c830b32a8e5c595b79636d9655a55e1be09110983c58eaa5b05011fdb0cc570d36ec89862f5d2602 SHA512 a37d56677060ef146f95a92d0c50bc91c9689608b54b437361143fb052013705f9376734b863b016e4c4d0d83b2117409af08477d973e8c21eae7e177d20abec
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-3.2.3.ebuild b/dev-ruby/dalli/dalli-3.2.3.ebuild
index 5098f7d6272d..7ed5e2376f58 100644
--- a/dev-ruby/dalli/dalli-3.2.3.ebuild
+++ b/dev-ruby/dalli/dalli-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 1f0e85d01b5b..6219c240ec92 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,11 +1,9 @@
-DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
 DIST faraday-1.3.1.tar.gz 840638 BLAKE2B 284f7f612d3ab791a00ceab823be0246685fa38356bfeb6e01c12e81c7369c500719a6023dd929160ca598b41401b82cda0d8e9e363d0e7bdd91791742f8e68f SHA512 b89839e5d602911904ce009f52d011c124f84811e0676a3a524d22ea7084d99a971b6573dcde6d512bf933909cc461ef01cd82a8eeb9df581c56f17f31966b1b
 DIST faraday-2.3.0.tar.gz 828503 BLAKE2B 51ab43910d05a5ab44f6a6acc792858c1c3c2d0d74e226d63dd1f623eba6a8f02558c09b99c53e6f6df3b313fa822035d2d12e6f00bb81e31f9f8c6237498e41 SHA512 5236e96cb203c2ef9ce882d081e5916f7f59e28e4b593dcb5bb70dd2581fad50ed6d6f2364b64966184155575df1732d136e81146e0ab5e4647f0cc40d76d018
 DIST faraday-2.4.0.tar.gz 829464 BLAKE2B f06322150a53c2de153d4373d51f440179fed9eeb95e290af371b09474ac663cfb561bb11f8557946259c02aaaa192ae7a2a01066b037da7e2a1b798c14cbe58 SHA512 1b51c6d24ed74ab5b1b6ed54f5e51d969fd53968adff798db0d31e0def4736e7bfd37b3313b1006989482659a04e71f0c5eefaaf9dc54221809cf25201a1d2b5
 DIST faraday-2.5.2.tar.gz 830523 BLAKE2B 2d420b7799e92a1e918d01df20b28633947b3039d30b099d641707d655bb76dc723776f2948dc22768087e693d6715f76907eb3162ea2c7194f00629f17b2774 SHA512 40dd9be959511a3e90ebdc514c924ec4c1243750fbcd6d94e4833f80dfe469aa7a1d1104aedc5292b52325b44f8a8fbeabac14f086b9766c9e8ba38fefac9473
 DIST faraday-2.6.0.tar.gz 830744 BLAKE2B 4ed5fa0fa4412dafe0c6ed20ef03393f8242f39fc60f269701ce6755b9d6b9fa60cbe477a623146fae2b1b0685fc86619b857c1f5bd6ce5e73df4a88846f55aa SHA512 cc80d7dfc6778ea184abc85476aba65fd2046dada4a88c6764a82841b561e84e4f44367191f2ec892d67fd7552e4444b922541cadd38d0ccfc609e90222fac90
 DIST faraday-2.7.2.tar.gz 831914 BLAKE2B 424d275519cd24f03b0a678810671de2541e799512789e0a3d80d146aafbc74e2acdbb3c9d3d1cfe7224860e9b716720b234fb25c045226f04b29223c640567d SHA512 41402bdb4594988a88542289c5a5242db04ae07081ba21fbc18b756eeae108bc06298b5ad7b48842a86c586b9da4e4568fc48ec9d26697618bd858649ef86294
-EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
 EBUILD faraday-1.3.1.ebuild 2439 BLAKE2B e41538c7de42c191107c94bca876198576c6fd1a7c43af9bdb23cb7e2cf7b71d799d92ad33f786736b65a4f5ba7c88bd66021c2f70254259998819aed1b3ba45 SHA512 8af16340781f5627079e7861ff4fa38d5cc55b42d3ef73e65f1e4698322632d4e55df60745d3cddea64b5659a0460816059bb834ae58f7b13ad48df715b73e8a
 EBUILD faraday-2.3.0.ebuild 1704 BLAKE2B b48ba1480ec3823e9083e5bb81fb9077e3c1715ec41675ec28a0c1c35def80b85ac755e46c2ac95bb1697df38a5079659760e3194c0d280e52e6ec1b8cb5f282 SHA512 7e30e7633b0a81f029d8b6d4773a16b078211f9603e496b27e0bc548d0846652656ae60628c5dd9eaed067049ee113f79327e046e1cdc27957a35b4dd8e2b417
 EBUILD faraday-2.4.0.ebuild 1697 BLAKE2B c5aa4b06d15b2e2d01135c5a418122b6a18c450804b820a7b18c92863c8ce6ba5fc4a826e931d2a6f0c00b522aaa671ff7eb80825f7d9fcc4fc2c6d84fad9dc0 SHA512 ead14304c73bee8e74201071e82d427df19da1a18d7e67ff4c96bc8cdd13969ea1ed639a4437c3a53986fb79a2364df5a3f5453d8d0ec3eac89880ccb77741f8
diff --git a/dev-ruby/faraday/faraday-0.17.3.ebuild b/dev-ruby/faraday/faraday-0.17.3.ebuild
deleted file mode 100644
index 54d02ec06f78..000000000000
--- a/dev-ruby/faraday/faraday-0.17.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	sed -i -e '/[Cc]overall/ s:^:#:' spec/spec_helper.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	#sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 59c754276869..a3ea76be4662 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,7 +1,5 @@
-DIST git-1.11.0.tar.gz 214161 BLAKE2B 69471f89fddf18bf31d74e318141046395281ba64de1f91fd49cb866508dca9cf7c568c113ed7d7e928bf1d7dfdb0e130a193d4069b87155a4dbc046d6dd6ce9 SHA512 a71da8890622b6ad5a341908e968040ef6c00e2f9edd0bfee1a0c1e9f110cc12b9c01015605b0fb902fdf04fab6011adfbffcf5e8f853c550bff7c263d2e6bd6
 DIST git-1.12.0.tar.gz 218472 BLAKE2B f5e0465fd2f0f2f1eb1584da6757c012cf80457a15e61b9a974707c8f026f34940d86b25fdd708b9fa6071fc35e8e65c6c87bc83b94bb0daec61ef015a03184c SHA512 9967bf6c9f00e29442495fb24abfd1ea3b6ad0068829e9d86727d41ecf07be0b8fbdc6d05b3c245a23223b4e35e87e984e7a60a5883839e6de45f8bdac406b0d
 DIST git-1.13.0.tar.gz 219424 BLAKE2B 38d1821c59cbb743c50655e9426d77f76e77dda614a711b7d2185ed7f4caa853383ba85ecf05237da403061d002527c38a5c6e06cf5e6d482ac76bac49a0db56 SHA512 7920de37a3df67b743e91fb317bd0cba746d2343dfb77036398fc124d00eede7b9ade5dd2af5f26d65f1f24006608a29fca55d5be8a00557caaa31acd0b274d4
-EBUILD git-1.11.0.ebuild 1230 BLAKE2B 47014a85314446ac871835aa7d4488da3ada0d0bb7d784010027d8ce4e15d4939a14dafed0355f9c3cb77bd3f9f7630e66e7f0f6760ff052243dd3fdc1444879 SHA512 efdfdf7a4a140bbce25b34502d9fec75883e200733bb51bddcc25f29ca4d803fab4ae88a1d9c341dc89ee7b16807fbb38a5fc5582437636b77288cd851d3a86d
 EBUILD git-1.12.0.ebuild 1252 BLAKE2B 8cecfda11f8006929f7b8254415ce8226183e29843f20cefab00efdd23aa670799d2ae38f3221c92f375b0f377d39920ba92366ec0e4a407774fc63ef885c13c SHA512 d87fac3a7d4cc86b2604c877f8bfc55d32d3d7259883ec3ffe7489957f202e8020d6ad9c21e3b87c569a9ecf9ac396ad3326725eff121cf44581d2ceb27f810c
 EBUILD git-1.13.0-r1.ebuild 1311 BLAKE2B c59850828f991c0ebab56f87d442bc2a4a6a45ecfc9d48a542b18c6340ae176c2d514080a0ae275196bfdd4d69892f163e04def4f69ec5bf3b20ec49740248fd SHA512 0edd92d9cde77118fd7ff25e1b0c4bf9b02b6436bf0f4d096c089ceae2d19a038d5200858ac96f7ebef56123d303f6da28524b7a438732ca1a6e3f57e3167b5f
 EBUILD git-1.13.0.ebuild 1253 BLAKE2B b2cce84a1bf3642d5d47d02279744a5def2466a69d6535c6e66be3606f89fef20d50551fbb6094d66373d71bf322f7f3d6d181d07f83d2e13adcf07ec37a1441 SHA512 cae2bda168b842100340760544edbd20eaf94b160c27f5c710c68c17799ae52bbdb967f10f474df559a3ba56c9fc19199b139b0cd59789e07baff493cb2fdcbb
diff --git a/dev-ruby/git/git-1.11.0.ebuild b/dev-ruby/git/git-1.11.0.ebuild
deleted file mode 100644
index 583ba08c7881..000000000000
--- a/dev-ruby/git/git-1.11.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/hipchat/Manifest b/dev-ruby/hipchat/Manifest
deleted file mode 100644
index f51251681f89..000000000000
--- a/dev-ruby/hipchat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hipchat-1.6.0.tar.gz 23328 BLAKE2B b9328e339f40ff1d865af5bbd660d479e94e18be98a74171125ff9d55e96353bf0ad9420e9eacc8b1a650f873d16a197418f7cc8728042fd403a7d1bceaa0b9a SHA512 43afbc2aca234d7d3778189874013df7847f9045ecc1d5ebd6b3772dce2a9cc5000fa6075867a9b0968d49410d775f3f56ed0a4ae637d6ad3893aa668895f2a3
-EBUILD hipchat-1.6.0.ebuild 888 BLAKE2B e8a2859b831b87cdbf922f78e7d69e89cbe3636ae354e11ba380ee3ce601ac343ffcdd50c5420c8f95c7beebcdac2747283fe429c934e415009f74a2985c9778 SHA512 f09b82387fe8556eedfbb4c5cec33d54d2195de7a44f4cc44720668b6b004ce6ef01b465ecc1100a3a7c4b2d396db198b070cebc58f1474ec12c657a5d6f17b5
-MISC metadata.xml 345 BLAKE2B 09a255637a8125671917a1ba75006efb3282c68e67245b99f2e94c7a7d0cc9293aad55908b279ce36a8680f0ab0cf1b3fe92643b11833d6cbc3b88823fd80613 SHA512 37d1c6242a55d8ac1d897984c849b94c00b708c5f7c40cdc8c4831e19dee077db57a9f011640b7d66ea1c0ff1f5333947567c0cbc3168440c5edd90aa7f0cd62
diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
deleted file mode 100644
index 38cb5efb61ae..000000000000
--- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to interact with HipChat"
-HOMEPAGE="https://github.com/hipchat/hipchat-rb"
-SRC_URI="https://github.com/hipchat/hipchat-rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="hipchat-rb-${PV}"
-
-ruby_add_rdepend "dev-ruby/httparty dev-ruby/mimemagic:*"
-ruby_add_bdepend "test? (
-		dev-ruby/rr
-		dev-ruby/rake
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec || die "sed failed"
-	sed -i -e '/git ls-files/d' ${PN}.gemspec || die "sed failed"
-
-	sed -i -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hipchat/metadata.xml b/dev-ruby/hipchat/metadata.xml
deleted file mode 100644
index e7bcf14f2141..000000000000
--- a/dev-ruby/hipchat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hipchat/hipchat-rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
deleted file mode 100644
index 1b752498a510..000000000000
--- a/dev-ruby/iobuffer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
-EBUILD iobuffer-1.1.2-r4.ebuild 881 BLAKE2B e0d885f4dd54aad736235ee1dc1c691ebdf20210cefef5240b672e501995be20057b4cf59fc131e46cb1af79a2a2785b688df5fcbc6ceff66c70aa30e41d0774 SHA512 6554a57c0ef1d1fd6717350a3c704c57757d93088ce9caacb01554753d5350f239e06f340e6c0c0319c9d9b38b31689e19b3cdbb25c1c301c4616856b904a8ef
-MISC metadata.xml 344 BLAKE2B 67d22609d5753ab791fb42a4fbf2b7373828ef88ab713e2da13e6eb87b2f1dcee0b6c2a997193c2eb3246e8f8a5d467269cdd0c6ec12431a08769ddb12f1ef47 SHA512 09432c357ce0754991dc0d95b303255851362bd743a915029eae0828f23cc8c1fd06ed4dc889b2cfa9c635d0289c25826990a8b60f6f32023d2561dc6d269c6d
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild
deleted file mode 100644
index 944da74a4ada..000000000000
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC=iobuffer.gemspec
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-GITHUB_USER="tarcieri"
-
-DESCRIPTION="IO::Buffer is a byte queue which is intended for non-blocking I/O applications"
-HOMEPAGE="https://github.com/tarcieri/iobuffer"
-SRC_URI="https://github.com/${GITHUB_USER}/iobuffer/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-all_ruby_prepare() {
-	rm .rspec lib/.gitignore Gemfile* || die
-}
-
-each_ruby_configure() {
-	each_fakegem_configure
-
-	sed -i -e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" ext/Makefile || die
-}
diff --git a/dev-ruby/iobuffer/metadata.xml b/dev-ruby/iobuffer/metadata.xml
deleted file mode 100644
index 0a899649106c..000000000000
--- a/dev-ruby/iobuffer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tarcieri/iobuffer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
deleted file mode 100644
index 95504f7ad385..000000000000
--- a/dev-ruby/logue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST logue-git-1.0.18.tgz 13310 BLAKE2B 42669cae48b5efe5785470410b694c7330dad5273d3a788612729d0e2efb9aabb8b3024727efddb4efedc1addd377242bc5a3ad5e9ede602f0f606be4db84608 SHA512 654681b2d1735790a08d8c53f9097ca28b64c37e902ff1260c8f2fa669067d404103944f0c78c5382a10b9491d8b0a10495516d3529d68be97c62027c2812c9b
-EBUILD logue-1.0.18.ebuild 788 BLAKE2B 8cd672e2e6bce6cd54251738dd6112c337d27f98eb6649cd3915e11097f739ef7477200237cfb95b545cc97517fe790b4a44b86e4b539c22c6f5f8edd6659d70 SHA512 fd115883a821ae914274b3d82e0d4611763c3d02af04eefad1b02e9307b7581e442467a9c1b286d8a8f142250438d96824f456ce5b207a9af9482c1209579f4e
-MISC metadata.xml 338 BLAKE2B 5953e56cd16694a9b2881d631b4d66cfca00aca542763343f2842f96fd572f917a10f4db689c7f590c28dd4528f3266b497d03cda63fd868580a51591883fbfc SHA512 e12a14e7104d360e6d8542729afaefa391f55a9b5a67263733d241fe0f4bea47064a7fef600cdaf6d7a003d08a4b571520c7873299fd8547cc0bdfe0cad50c07
diff --git a/dev-ruby/logue/logue-1.0.18.ebuild b/dev-ruby/logue/logue-1.0.18.ebuild
deleted file mode 100644
index 4a84bec6ae19..000000000000
--- a/dev-ruby/logue/logue-1.0.18.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rainbow:3"
-
-ruby_add_bdepend "test? ( dev-ruby/paramesan )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix path to match installed gem path
-	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
-}
diff --git a/dev-ruby/logue/metadata.xml b/dev-ruby/logue/metadata.xml
deleted file mode 100644
index 2647a278e55e..000000000000
--- a/dev-ruby/logue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jpace/logue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 6e877c746bde..83c18f8b1148 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,7 +1,5 @@
-DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
 DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc947214ea33d57770b5f2bf2594fa5b29b8dd9a417233de0ed243a12cdc547e5e87861767c5bbc65adb90cdbe58a484 SHA512 1d92ad19cb8bf80aec4ada23c49b91588c722551695cb0dd7b2954001fd71b4b4c030f8317b86766451847273c6116baa041c03e2415df2b0f81b20551dd8566
 DIST net-ssh-git-7.0.1.tgz 227016 BLAKE2B 98cdbad0c8c52d44f3d4e288de7de0389680c3f77d5cbd33e4a142d1f09881910f2dc74df01ecfed755e2e0ab37440ee19cf436b8aa7c49a3859bf07b3844b15 SHA512 3e41537b3b7e34f043c768959c382f72a630bf3ac430bbbd743323d9b0eade6c7b94f8948418b7f3e1aa2422fcb87829387aaa01e1e384ed297e2397cee33feb
-EBUILD net-ssh-5.2.0.ebuild 1032 BLAKE2B e19af0235144a5bbfa6e15c3a94789cfa6116a77a56b64e70040546849a06f8072632dff3fcb55e29576317438ac48c715aedb9d093933775b4759426e020d71 SHA512 03ef7ae6bd2ae1537c11ca88f250dbf0eb79f3d0a9db1dc30f386cfa165b6f4d1095e848da9c156cc31185fa8b5374c739c289558fdea3e06a06507106852b12
 EBUILD net-ssh-6.1.0-r1.ebuild 1258 BLAKE2B 5d58072a3d8b197601865a5cf2c74e31ea9ef1b63f3c446f73fd311a11fd5107bdc4198172c6450ce65cbca41248e3ff3000125f3890b317da926133d432bfad SHA512 301572ea0e6b4d1c9e6353e97bb5b00832622a08cd3573766ffeb5d1ee7c7152e9113cb39d985f4297d37d493afae47c775c7aeb805e9d9cb9509e66a8fcb1b9
 EBUILD net-ssh-6.1.0-r2.ebuild 1258 BLAKE2B 5c49f0b124cb9d4b9e0ec28f484ae293fb38cb09a4057b7a5d8e079ed4bfc490779d250b91b7f99d110b4d9de65773ae523801463038b79ed487d78238798677 SHA512 107f2893ad85de3b84cef45a6abd8fdf505e479b94b40e34b1cd1929a1f3e6d3c4aa162a29e6088fb188a17373412cda5135677fd5a5cbb128d08d90d3637363
 EBUILD net-ssh-7.0.1.ebuild 1269 BLAKE2B df9392d7eaf85e32536414251b49b8463d23c2c0950b9d92db25f5f1840a9e5ecdfef344654cf9166765c7bd60cbfaac4d36a5910d6bde9490e103d7b4155f0b SHA512 4c26a732ad60115cfa437c3e5cea5923e5e6eb456ed6f4e53d63f480988ecc4ef0bba9676ea1ba1bbaf9a1d8b3215f0c16c68b1753bb36dbc87328f8814a196b
diff --git a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
deleted file mode 100644
index 09bc1c989cec..000000000000
--- a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index fc2326a67592..9c10773aa969 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,9 +1,7 @@
-DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
 DIST public_suffix-5.0.0.gem 114176 BLAKE2B dc7a7dcf3d84130420d6243aa0a9391c141061fbe0fa70d85ce120938f3e31d617cf022a853dc9839cf49b997c1eb85f49a8759f357820ca32f88a26730fa473 SHA512 89dc076e6c55790b1459ceb0b0587d20b80d8a681bab6db2dd213e06f9bf9e55200e86cf891c92b310e691e7b0e1bb5ae95e28e3a3307541c2f020e5f69abeb5
 DIST public_suffix-5.0.1.gem 114688 BLAKE2B 7d1f2bf8b05c4de548b281f01a50eba8911ca9d56f42301139e0e3242eb9960db7b6fe312f4b65996b9b796fcc84748c53968771417b45773a453dc99b2fa33b SHA512 9498d53af79ffa7ccf5f94eb4e54c2281ff3e025d963c9024aeac06efa919dcf766a51f901ab6168125737b6f53831f8835d5777739fc45ddb66c99c2e573746
-EBUILD public_suffix-3.1.1.ebuild 874 BLAKE2B fd5a479bd94cf040749c6933a6bd012763dcbc11fc200897544c85e1a7ac83839c3f37a3f75dbb34ca4a3e050b6c1c68716ee18cc137e84c0955b67ba731997f SHA512 4a019c94279f7befa531d27969399080e2b6873c24468c4d7eee36c5acba71f0110c53e2fe7505f24e28b153a6a72516d4cac40e0c9e61a4c2f156c8b1078fa3
 EBUILD public_suffix-4.0.6.ebuild 814 BLAKE2B 03948fd4c736861e92035ef694c0ad24e1b31e62f98cd1a777d62d2c802260722713c3db6d1eb480f691c98ce6fa577c6afc2584bc08f5e581c342c4ff7bdc38 SHA512 0d7ec35b03cd96d3ea1a451ba02812ebbe37f998bfdb978a0297e2125731860be401d085999a87d2a33fb5d5c836ff8d03d4ff44edc62d884666d59a2afd8a6e
 EBUILD public_suffix-4.0.7.ebuild 831 BLAKE2B 97e6de0503f2db469240e3b6e968911dd57acbbd4cbb5a2f24e949b9fe614dde6d3074460051142150c3d4234f9a94328c0d25437a9b2e29cd1c9ef4e001a258 SHA512 9d5f1c764445c8a2cc8b821adeba402b1c8607aa9ebe4584c0e8f7753f69fdb98b4bb185c46a3796dc3ef2e351065cad1ddf2f816e81a4d72d95750e1637e627
 EBUILD public_suffix-5.0.0.ebuild 824 BLAKE2B 37c71816b1a0c0e32a4a71165d25c7afe29cf8bcb334b1b19fe851be61b551fe71c90d841804d09faff0fa8e7c1d843dbadefa0e3a289051336331959650f3ab SHA512 85521eda75932f4e2bc77f412ed3ab2eac11ca02226ca044723d9d5f0b204a0338424a5857dd0d9f45f8c6f32723cb94134423d7c4aaef3a7dfeb3d8be08fa25
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
deleted file mode 100644
index 954658807691..000000000000
--- a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
-HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="3"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' \
-		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
-		-e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 3b8fb0fab6cb..80e1b03e6689 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -6,6 +6,6 @@ DIST rspec-core-3.12.0-git.tgz 408651 BLAKE2B 97467e57059cbd5fc32763c2b4d8be2b6f
 EBUILD rspec-core-2.99.2-r2.ebuild 5114 BLAKE2B 5d08c6141e2a07a076c4fbbd87b27d678ae5188b79019577030457834a785be04a3b78b8a0f010ee01ab10e362f28e5371c5854c8d5e7fb71a502fc8281a9417 SHA512 9df8b0b1d841904915d93d6b225ab320638772736605a8b034130fac1cf64b075832024ee2bb354c6539e92e10d3d11ab8012b897e2f598de48e8d58040c232b
 EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 97a103f3a9db0325d58c51eac48056afb0bd50447821bae73611d3bf6de377edf14c5a3df6820fc66480dc1196cf3fbebed543ba17c122c48bc6a03d754e4ee0 SHA512 67adc087c6d1d571ab8b71821e2544bc747259c8bb281073a15c821dac4c80b9d6e3f10cb26ee77198db56f72143a7e187a920d0363170f88ea4628ee4cd9286
 EBUILD rspec-core-3.10.2.ebuild 3136 BLAKE2B 6c6f1e4eae24381752ac4760912700a895ed9567e15dbba09d8b616b8eda98cd1db49849a7ce7fb889f76a5f6a6f7e1e1491bcbe6f4bb9c59d12f3cc0ea6d53f SHA512 94c1453a68ba13e4c3bba8f445129ca87046ce3e922a9e1d4b78070e5a4935cb634b8f302975a4fd52abfd35eaf2a38ad101b4f03e5898c9a830d7535b0f08c6
-EBUILD rspec-core-3.11.0.ebuild 3143 BLAKE2B f4206093e7fbb90ea1cbb4d4d1022714b78f50e0272ad08707348a21f42e28486b1864fbbbf482530eee7b482ed2d0e1a7b4c6554151162bb16a5ce26149c0a6 SHA512 b69c76f107ac9fa648fc94191e5ecb33bfc7dc5e9e264df6abd0ca63fce2b4fdd09fc0d777e003184b7c1c29ca0c432c0fee3bfff06dd99f33604012954770c7
+EBUILD rspec-core-3.11.0.ebuild 3139 BLAKE2B f4a4a22a69c233d2f3b28bfaa9ec3abdf593a9dd31abe6c2cb8a35d59215ee9dcdb5721e9765244da66d3666b0273303ac668759e59bd52b064a8d9452318b31 SHA512 8aadfdf69e1a87ea0bcfe65d9f18cc1eaac97b60679b99864ab5aaddb9c86efcb24712edb9e2766bd11fb486e354df46fe07e5c879044c0b09ff078ad34ea071
 EBUILD rspec-core-3.12.0.ebuild 3169 BLAKE2B 28750a7498ffea712fd32cf16935a155bb6f82eb4c785853e31d3c33366f6938d9e461229f9165b7fcbb045dee461bd868c8dc81e3fda0a9d1c2d5bcc67300ca SHA512 646ab4849749c4dd929ec8cc7956167e6a8c231214eb7e69ce9c8d9518bbdc87cbdfd54454780bc6482b46fd006d517b441e25ad4ec24e41ad5c633da753d10c
 MISC metadata.xml 466 BLAKE2B 008536967fd0a54923be3f70885dce7b04ca3746699dec4bd0f2ef56a41997c0e44cebd553d4c899fd815c587eb1f5338d86033d1d3e96289aaffdf9a9fcde06 SHA512 9a1f175cffe5136506e4d3b185a7bb974dd3de45683beda00267d47339472ebf8fc1cbbb37ef6012f14cb3b0535e386d98e3bfb7a955f9ee20484cd2ad9013c5
diff --git a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
index 0b23febeb669..1a0881e3194d 100644
--- a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 0266a18b06e0..56c3c42357c4 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -10,7 +10,7 @@ EBUILD rspec-expectations-2.99.2.ebuild 1638 BLAKE2B a15ce1cfc2d48f2820daad095ca
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
 EBUILD rspec-expectations-3.10.2.ebuild 1318 BLAKE2B 728632075a61aae02e2b7457e48af0acd9eb2cd4160e211cf2b612d7b12619856f024d9c177360f700d4fcb32f1ae569b49e71531c778537ea5cc08146086747 SHA512 d46ff515a45bf7f501383296d8191d7ba07b149dfc2a10209ef9161ca79f1ad57577603fffb907779b1073b6c8f5a24a1cec5dbf13f225b7736172eba1c20a22
 EBUILD rspec-expectations-3.11.0.ebuild 1325 BLAKE2B 3ca7f8d244ab7207be1b5ed91a9b05f0efb2c2fa28eee1a3e6acb1043d577214cb647716e0cfe69ec6330c133e3ce10150402164a654b6eff97a095ace891787 SHA512 3e76740a1be944ca8fb28e1b55da0eba1b35c2d0adf45f2c215b0a7458548e49c0fff445a9e9b9899d47a1bf2240f38aa0c4dcba741e53cd5ac75251017be3db
-EBUILD rspec-expectations-3.11.1.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
+EBUILD rspec-expectations-3.11.1.ebuild 1314 BLAKE2B a5dfa85b16d08513f7b1450387912aaddb885c3c3fb4867c89b08b9b2e31b6a558de4725d71dc2da47135c9a66ba84c37c0553fa2d14c7384745a3d2df6cae5f SHA512 8cbcbc1d1bfc87020660214ced1fbca61a946436804e70864c358a1114ba72c044b10ae64d082a32bd61fcfe87da94fa155dd4027b29f82714b8d4db25d61080
 EBUILD rspec-expectations-3.12.0.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
 EBUILD rspec-expectations-3.12.1.ebuild 1318 BLAKE2B 8a9a06d6ffda7519a16064b7fb822aeaeaeaf0ce8a2062938b56e3c9c8f19ea26d84a9d3ade86e1fe7c89ce93928b521e07ac73fb3a5e6fb3a32e527e6df075b SHA512 cb4fd3c2fc3c162c96122b495aa6521062b1b85efb37cd622a1384e1e1d4148914937c2baa812c37a5308896fcd6ef320e2303c2c2e32546e83954e5edda9880
 EBUILD rspec-expectations-3.12.2.ebuild 1318 BLAKE2B 80713ab20268b191458fb6484966e7e9d3680ca1e9c900b7da821caf6ec14fd444c3318694416e2732ada0c4642b9ac383ab9fccc6d606f6f8619925d6e80076 SHA512 c0c52585417b6a8f6bc0eb0e17b72c9ed8321c368b8a00cd0869f335c486436220bd474a5b2d84a93347e98284af6a4eff7f58a74ef5420abcd0960fded38b8e
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.11.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.11.1.ebuild
index 7e2877d8201b..8d58d8c2ee8e 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.11.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 49e594af3379..05e7a58341d5 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -12,7 +12,7 @@ EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f364483
 EBUILD rspec-mocks-3.10.3.ebuild 1442 BLAKE2B c980f6995e1c6e16b8c7ad463dc2a29ac19a2d9a0deae49a625d430f332ef3b1a49bf09cec4b46d80bb0a2f01abdfce478858f96731e5e771cc7430a025b83ea SHA512 a34266c160e0953251bac75dcf8ff18b19d2c42a49ab8844dea7033b22120563b29efe870755b1c2e8e4f099018c45011f77e2626775c8a1b1ee60d8351f1081
 EBUILD rspec-mocks-3.11.0.ebuild 1451 BLAKE2B 568141913af25f622e510c7287bc1ba6c16f4b119c231d6b3988abb9485ce0cf52f058219314effa3540f7cb78c212d0a87c5a8cdbc9157503cd91ab34788263 SHA512 fbc0a4d2a0d8d125506f32408b99c882ecc1849733a1c957af16b36e4e0c5bd5c0735bdf8e27bc04d6aa6f952eff70cc2767f7bea4d1ceaf2c1b15b53518c904
 EBUILD rspec-mocks-3.11.1.ebuild 1458 BLAKE2B 56d68d0f345b15d6ae06307d4d0261d259324ebbb79969afcd9e62975c3870bee3dc3d002a2917eb83ee7fc919bd413a406f9d17640da699cf8449f5794a8860 SHA512 dbe45a2f9757daf37f4953538be42840b16e4cea3403b4dde79541a560a5144e31dd0c6c60669a33b723a077a9c4fd5251cc148a9d5190c950fa1479f2a1d315
-EBUILD rspec-mocks-3.11.2.ebuild 1451 BLAKE2B 1ad96337e55ec4f4f256c7ba81d625c0d27f11a3d602661ee9ca811e3809e00429a2ae9fb8aaefb0dbd9ab844acab23c6dd6a9c4df0829090ee82949858b2ad1 SHA512 5f51ab0781e583b17ad0975d9f2c10637a9c30067fed93a0a02d62634338b7c25ffdc5d2bd592a9e18d1ef050f797429ed9d959b236573348c33cab751a08f91
+EBUILD rspec-mocks-3.11.2.ebuild 1447 BLAKE2B 66d2c48a82942708d323d1c4260afd6847a73774884d6c1a4f0a3a790b7d2631f4a1f334444d1e26692c7606657ae4761b278670390847aeaf1407d099a2769a SHA512 7b8ddb80c2ea32305366a1e7e82d70bec0190a37d3e7f5f4daba786d9ccfc0bb7f429c989d64b8ea16ed59d60dab04b52c92ef2597f7bf43176cf49f4ffe6110
 EBUILD rspec-mocks-3.12.0.ebuild 1452 BLAKE2B 33b7391074e25374e5485f960dcd08f8c9a329f4ddcc97f2ac7fc3632b754d3014c3cc6a89dc59459d9957cd74338b3eb6e4d8619b85c618a533e4d6d18962e0 SHA512 81097c356cb4c879c4ddf52f4f32de61ac2f5fbe489449536abf9334bf97aa89e46d388b627c3a6fb46b2c194e61d8e0b0a36cc43468bd5174b521aba9658879
 EBUILD rspec-mocks-3.12.1.ebuild 1452 BLAKE2B 33b7391074e25374e5485f960dcd08f8c9a329f4ddcc97f2ac7fc3632b754d3014c3cc6a89dc59459d9957cd74338b3eb6e4d8619b85c618a533e4d6d18962e0 SHA512 81097c356cb4c879c4ddf52f4f32de61ac2f5fbe489449536abf9334bf97aa89e46d388b627c3a6fb46b2c194e61d8e0b0a36cc43468bd5174b521aba9658879
 EBUILD rspec-mocks-3.12.2.ebuild 1452 BLAKE2B 16a1dea2a9f1190a7fd5a14ea16b4fa46b26df448ceb7824e0fb49e707dd5dde4d00660a12a576ba24be11c13c38bf3e43491dfdd5e1c4854ccebc3eacb9ed4f SHA512 4206a7d38d40a1918e2586595fb1e4df9bd7062711955f677bd839faec11dcc1613bf28a07c658e400221b51c73d9da12b970f127cbe4d87469e12267e8462e8
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.11.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.11.2.ebuild
index 4b4d9b0f3e69..47478ff01262 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.11.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 63b4d3117dd3..419e104c9093 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,8 +1,6 @@
-DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
 DIST rspec-rails-6.0.0.tar.gz 161222 BLAKE2B feaff94148d8b33e17ae3de5b9636ba238381d46836bbeba8c6ddf03c1d7b84c0c9e78e13c6b5198342959433ca165c438007e45923a70cb23190d974b340506 SHA512 7b15a5f9313bb76e71a69f9158d64c662a4cef2f8aae7a20748281224a720d9f2555ec9eed3ebd3aa30ba21608d6492caf14fefdd14a84ea765a4e60439830f2
 DIST rspec-rails-6.0.1.tar.gz 161289 BLAKE2B 80d91fe4c11848fa3625c1469dc14064dfdd93c54281c9dcaf71a845dc2b07ba8b290f045a59839d301278103d9e241c99781058886f1d792db3a7d8de80dd26 SHA512 a797dea121d902bb43add4d35e9a6d324cf52f28acea83ae4dd7a69e33e8fd531857f175a35869391c82900f55182ec4c2519667b04234fec54dc99b510a85e8
-EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.1.2.ebuild 1630 BLAKE2B 4085ca18959ec2c8ead80b2fef8bb46c114808ac68582973d080be8880c0e587ea1c7e89802fbc2ad311c5c9391b5ccfcf8bbb59584f788ed870569a246bb675 SHA512 d0858f55d48055077fe89ccb518a461bb70f73c9416471ddbdd3ceb338d4bbf5cca59d9f20bdc2d7249cd7131ad03ca48632a8b34e61942a09441bc5ef33bdd9
 EBUILD rspec-rails-6.0.0.ebuild 1551 BLAKE2B 63b67ed2a3de16c932d5648d6f85299dca7f9a15a043867a5233fec999efefb06e2879e3e0dd40e00868ef9cb4afeefb60e72c7d2b15cbc4185f2038b670cb61 SHA512 a0f27fafecb2e63c103ca4e7416de6671c7f8fe4890289bb0140526cd55a71a6b952dca0324720e124c30ed7654db46dfa0b58b6a0526246f8958d9f6800a280
 EBUILD rspec-rails-6.0.1.ebuild 1551 BLAKE2B 63b67ed2a3de16c932d5648d6f85299dca7f9a15a043867a5233fec999efefb06e2879e3e0dd40e00868ef9cb4afeefb60e72c7d2b15cbc4185f2038b670cb61 SHA512 a0f27fafecb2e63c103ca4e7416de6671c7f8fe4890289bb0140526cd55a71a6b952dca0324720e124c30ed7654db46dfa0b58b6a0526246f8958d9f6800a280
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
deleted file mode 100644
index 4414e29a7f7c..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-retry/Manifest b/dev-ruby/rspec-retry/Manifest
deleted file mode 100644
index 43ff3bc29f10..000000000000
--- a/dev-ruby/rspec-retry/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rspec-retry-0.6.2.gem 14336 BLAKE2B f619f075c13f054dd73f893a37d2da644e4a77b2cdecef886b8fb2b8616b5c89b9aebb8506b94319e0873fd798c0361a8defeae9e651c1a17b9d2f7b26364134 SHA512 a14874f6589c78a00baf9d50d2415bd5533559457de313a5b56be77f4e226d8885f7e976bd6926b8be669f44ec672a6b16dbcf4dff26c26ca8eac64a25fd1b5b
-EBUILD rspec-retry-0.6.2.ebuild 647 BLAKE2B 75117dfd90819a0d79deb039c619388544ae58d77b1f4fb55e154f2476f27f2388eee34548dd524b0b1f1717aeed163a014de72e683789955ae1010e1387e4ea SHA512 8db473fde23daaebc272e37d7f2d4d1931fe3bea859294d29f721b61aa9356c8ede151fa2f8d219c2341058d23b792b7e78199b1fff26525652f03ad4a75c4aa
-MISC metadata.xml 347 BLAKE2B 0da33d14b60e615f4da18fb9807c26cc05023cc06782d1b4327db38d64b147fb9379780dc1bb2068c309132b746c0c12e1ae2ae9b3459ef361d2eefc1399a931 SHA512 dce60974b3a37bea8dcec58dd3bafd0cda5f3babeafcae9d000d17b6429f6c544f124ce0fc34b88f8de48396b269b2def98160a7e415495f89b293fb0d1a955c
diff --git a/dev-ruby/rspec-retry/metadata.xml b/dev-ruby/rspec-retry/metadata.xml
deleted file mode 100644
index 011bdd8f3bf1..000000000000
--- a/dev-ruby/rspec-retry/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">NoRedInk/rspec-retry</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
deleted file mode 100644
index c82c2bbfb528..000000000000
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retry intermittently failing rspec examples"
-HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index f42e4d33aabd..d32c29e5a201 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -6,6 +6,6 @@ DIST rspec-support-3.12.0-git.tgz 78119 BLAKE2B 75ac5a3e03582fe11fba164687eddf29
 EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B fcde701c0554886322c31ddf8b8b84e6007e8bfe8a601facabed603ae36247193ed5dc5d9db16246bc2692f5d670a0945db08f8ce16bf8dcd7bec377d0556298 SHA512 e5f98158b36e72bbe08ac8b8ac56030776e0aa6331751b9fca32a75b03809eb4f4ecc1914d642d3f859f5285c12ae33a4c329304b0569042436fcdd0303090d7
 EBUILD rspec-support-3.10.3.ebuild 1765 BLAKE2B 7890f1d241eece860ba86de1d889539a8917aa8065b44e6caf83cfaad782da16ee7970db4575b023a333caf72fcf86a1ffaf89e10a607209a8b713530b00536b SHA512 746a264e2774ebde5fab2903db7b7f78e7154ec76899e1fa774640efbc800d92bd7f978db1c2d0bcb822d9c301cdcd7dc7dee873ed847d58cc5ae751e47395be
 EBUILD rspec-support-3.11.0.ebuild 2131 BLAKE2B e7a389de27cd9918d1d9ab0185f4f563bcba6907657e91293bfaef46893c522f46a198ab08c249789f8c02e7104c60c218e2ae84d37c162c240ec8f98c286fc6 SHA512 86a8a690d41c668476d5a6def290f48fca72418d310e5b0c9ba099b6effebecde94a13bf27344a4c0b88d6f94938694651eedd061f5a96cfffe2153bd8f1e924
-EBUILD rspec-support-3.11.1.ebuild 2124 BLAKE2B 23090dc2ce9db3cb153402df2b4f2c2a789eff699e91e516ea6e9ce41aeb36190a90dea9085c382716487e18a24afbf36aecf6d7d1d292434ac6a908032a7c32 SHA512 f60ce51573ee07b07ea8814fb66b1d249d800f01d6b8bf994fdc4b2286b3ff28c8a78baf126bb68be611fee54f4e08e0e2def4aabeece230d6c5d577633ab7e0
+EBUILD rspec-support-3.11.1.ebuild 2120 BLAKE2B b8e24e14b87db693ad14711e92d88710b9ea0f6dc16169cbcd79651850594843bf64b5edafcd5f5ad721428f0e5b738b1d1df42ab4818605d79f1653f522cfc5 SHA512 4d0750df875766241fad945c3279b1a1fd240c4cff9420ef3cc75b299beb3b2decd90b08fa5ee74bdfa909e69e4cd1483557fe0e19bdbd944b2217ae09ee7c14
 EBUILD rspec-support-3.12.0.ebuild 2124 BLAKE2B 23090dc2ce9db3cb153402df2b4f2c2a789eff699e91e516ea6e9ce41aeb36190a90dea9085c382716487e18a24afbf36aecf6d7d1d292434ac6a908032a7c32 SHA512 f60ce51573ee07b07ea8814fb66b1d249d800f01d6b8bf994fdc4b2286b3ff28c8a78baf126bb68be611fee54f4e08e0e2def4aabeece230d6c5d577633ab7e0
 MISC metadata.xml 346 BLAKE2B 74d62cfe1930a3bfaad9b1b14ce55b0de81a0963f1e4e5ba0f104ea51adac0ba86c7cbc38831630029a8e487623df0d279028b5d1b2391eb2bdf060582c80be4 SHA512 60c7dd2d3d9d103b3c0e505d62975571eab89bdbc92203c2bff8cd9b854dda3020490f9592464760798b8e5d973ab3be7b142dca2d03583b822fb0a83761a225
diff --git a/dev-ruby/rspec-support/rspec-support-3.11.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.11.1.ebuild
index d4946c6dbd09..d3e6b9c45ccf 100644
--- a/dev-ruby/rspec-support/rspec-support-3.11.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 3eca55c180c9..2d10a8a3d83b 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -4,6 +4,6 @@ DIST rspec-3.11.0.gem 10752 BLAKE2B 24941576037669a53373d263bda99c7c98e295f5d616
 DIST rspec-3.12.0.gem 10752 BLAKE2B 80beb56bfed2200e05c8fbe040a265f4176a7142a7c077564821057eec2aa02f68c2417eae5e0309221457d419bf0c9af9123c5e8f1f19992a9361298240c0c8 SHA512 24278c467e5226ad1a5bb4c64190fb5d1077777237d9c2e5c4f16a00b026bf26d8f15e2c74a34221b198992f73ef06af314488a61358968e2083f935467e5a35
 EBUILD rspec-2.99.0.ebuild 756 BLAKE2B 9ef59d83c8444553ebd284ccb1f4b380a13da2bd4f264f1c07a2141ae5eb161140209c25f939dc8797095b98bff5f35ab44c29c4d8536fda67164c137fb04df7 SHA512 1440ee45aa7f8e9d6fc9f9794b891a2aa9c6096aabec0ba163046c67096a2fe26295e9baaf971a068f4f1aff9562668c416359ab434394249aa2f8b5021aec73
 EBUILD rspec-3.10.0.ebuild 623 BLAKE2B c7e4ef791b19198ede72a0a35e595ea4cfb6751aa2710490c2750462c0540b4c74c94840af0984a052c359aded136d0139195ab0148929a6235735774515da3d SHA512 74804528284286c96c653189683ca97996e6325789ae0c4d48815c939d98118193868d24a057576ebbff3761902dc1023648f17bc620a62fc9a773235bdcd551
-EBUILD rspec-3.11.0.ebuild 637 BLAKE2B f5899e229e0280ee127a1910cda940b2554107da3bd07485bd1844284c518e15f4e4d2b33e793795bd96f46445ec53a87ac625813375f42ca612f1876b6d50a9 SHA512 1d7ccea55dcef85d425da79b499e6137cbd40d10fed1229d1daab24d7e3886d57e676938059b0eb2d138b3be5c333cabce3e246992712057d39b94001b9e9674
+EBUILD rspec-3.11.0.ebuild 633 BLAKE2B c8fa0d431f35ac3efb56ba276b72ae10c31bbd4767ad14047738f949f0504e4f684b4276aaaa2d600f58c6a40fc220253ce6586d7548564cb0b8285b2b201357 SHA512 0f691fc54a3340b2285caf69d31d3712db8ffb8c5892d0266d4e2676805a0bbc78b8b765fe2c9415f0039acd8182bda854442473a2f39e68195bcdf03523122d
 EBUILD rspec-3.12.0.ebuild 630 BLAKE2B 7a2839438c29b8e6001267154ea1bf38ed5f05b9759f7b98414675db8b5ea6ae2806309fc2783bd5c42643efe5965513f550926f9fa4d03dadfd216195ef02a0 SHA512 ddd24b5820d31e1f7809891d9e5d936df3b2bfebe3cab19a4d38ec5832702d47af4cb611920731dbbf3dd635c925c1f72771ddb3b4377f46341ef2d32ddd554f
 MISC metadata.xml 338 BLAKE2B 1e5e8d2aab4bb1d0c8d8826267a9d957cd051b4d9d687f38609d44f78222bcb13f415f7ea46aafb968f005a701b94716e00137d8e5afc55944f618694d9fdf5b SHA512 8230df512530fd14410adcb365feabe3e79b826b047759a2631d234bdc00ba807a790eeb646fba74547aac12c577a0b34cfe4ca1b71c0633728982f0b6d1bd17
diff --git a/dev-ruby/rspec/rspec-3.11.0.ebuild b/dev-ruby/rspec/rspec-3.11.0.ebuild
index d05d6b4a8d7e..e7462b1c732b 100644
--- a/dev-ruby/rspec/rspec-3.11.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 7aea19924f32..9a3a006172b5 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,7 +1,5 @@
-DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828c7562df212383a8fbea9615a5136e3382aba0fcf17952d941c7b514e5229c0aafe3dbc320386698eb8756f567eff67722bd SHA512 0e7891c19b8a0b20441d85bc17032ecf03cba7ca435846e03abc50b62b0c53c075dc70456796c9bfcd1ecd28ecc517f907a3d6868346a07617fd1d0c1b9437c0
 DIST selenium-webdriver-4.0.3.gem 152576 BLAKE2B 671909863bbbe328bbaf30a9e3c9e459e9eb6b892f554729892327230c03dd03f7819d9e8beb901cea986cb0d97877ce49853de856e1f802369686a03e5e9086 SHA512 260ad111ef9c512835f410fc7283df90b245d42db12274028148575e0a89a8c71639f0132a621f326921317b3181564521d9e801f2a7f14e5f196cde2550773c
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8 SHA512 9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
-EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
 EBUILD selenium-webdriver-4.0.3.ebuild 1015 BLAKE2B df6b7d93c12ab49c58fd76b561597beac3452d7e41075a04fac82ac1282e43846924232015f73506ddd6c11856cca27fee8eb8e51f4587dc19f8eeb4ae941207 SHA512 2a272f961e101c996dcc4b7cacbac94dc5257e95fa6d07ac9fd4f6815273873a376482b09079dbaedbcf50e5cfd6bc59c75c2a35fe152ceffdebf6daa1cbae5b
 EBUILD selenium-webdriver-4.1.0.ebuild 1028 BLAKE2B c4b3028f3065a6103c0d411809f79e79378bcdf031c9c031f550e45e0d7a23287abc7d436ed2a0e3132594a4a9a5fc88a8a4022f52a36b74ac3690be58ce6fae SHA512 38c2795d6916008dae0e7dd5b5d06ea1feef0ab0dd1ab8731fd105659e2cb44bd3b3e8a7ffaf7be83e5af03daa0ac1c81c84a64da9b9769c63b211b388082944
 MISC metadata.xml 336 BLAKE2B 2133927d6a27b7422141ed649e46efc069300160b5fecb9fb5bdbf575461fde2b12411696be46cc673d6996c8711f50a46e92e1cdda5ff1f7c57ae298ff76406 SHA512 d1f80b8bf35f2fd08e4689292ce535ece939a64b94123780206d4ee3ab7a20b6d9c3a2d9f5248eaa2d0d35bb32bc5707e14c09b60881d856a180435b8f656bea
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
deleted file mode 100644
index 443cbb2b93fc..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
-	>=dev-ruby/rubyzip-1.2.2:*"
-
-all_ruby_prepare() {
-	# Loosen childprocess dependency
-	sed -i -e '/childprocess/ s/4.0/5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/textpow/Manifest b/dev-ruby/textpow/Manifest
deleted file mode 100644
index 49e21603718e..000000000000
--- a/dev-ruby/textpow/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST textpow-1.4.0.tar.gz 386724 BLAKE2B d2fb051810cdbe26caafae62d402ba257a644ceeb5975b1bce8858e8359026bbeac7795b264c84462cc6bd02b5a110eba70338d955ba793cec8abdf194089217 SHA512 134b38e277118cf626e3e3643e447d7c7914dc89dba527682c4d6318a0d3b96edb81a68ac5e039158058de371ab9a326088cb119069c55032de7c2f1dadffdcc
-EBUILD textpow-1.4.0-r1.ebuild 688 BLAKE2B 5bd02fa71e27bc1bebc466b9ba4a79083e7cf1e1cd97407e38d90759880588e7e15753f2c616a493ae2757c71ff9bfcb324a0bca135803bde3217da7a9d8a543 SHA512 34152d7071a8e583b049162764bf9aae1f5e05272dc6befd340ccdeb6cdd8e176fb07eb66360e8bd4de8c5a43a6cd59c525cd8f4bf4722ce6171e42609f3429d
-MISC metadata.xml 342 BLAKE2B d68743f85d62ce1b902abc26394dd749fb55d2bce6158af57aec463bb0e9adf943488ad18d9fb9c27f2a323db82ff5e6a09fb32d7c674aafc1a7b1161ee47513 SHA512 1915a232a82f3ff413f2c7844d563c3b0f0f6f12c15be385ad553b1cfa87b1bfafac33db9cd3d85cdadd98daa37c4401f5899a272e2fe9d9e5cf3e78bd8fe1ba
diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
deleted file mode 100644
index 9667a82929b1..000000000000
--- a/dev-ruby/textpow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">grosser/textpow</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/textpow/textpow-1.4.0-r1.ebuild b/dev-ruby/textpow/textpow-1.4.0-r1.ebuild
deleted file mode 100644
index 6f226958c65d..000000000000
--- a/dev-ruby/textpow/textpow-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-RUBY_FAKEGEM_GEMSPEC="textpow.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A library to parse and process Textmate bundles"
-HOMEPAGE="http://textpow.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/plist-3.0.1"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' textpow.gemspec || die
-}
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
deleted file mode 100644
index 418f981679fd..000000000000
--- a/dev-ruby/ultraviolet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
-EBUILD ultraviolet-1.0.1-r1.ebuild 657 BLAKE2B bc83e22798f9e9a94d20506823d7da13b41f4bfe1c72f691c0e2055b08e0545c46ead88c66311b2d9f9cc2f0184dd4967b243cddba8f9585f78aec3060c89a3a SHA512 a1f2b3dfcc88ac225c902d0686be4536713db156f8514d52b639c9a723f9015610bf408bd66325ac397eb6f45af95c7ff088fd44165bcfa26a699ae9fd266b8a
-MISC metadata.xml 346 BLAKE2B 7bc7e18818839b81dbce04a1d9530d4d517ec3ef7c537963862b9339714e7b454192c6a9392c2db295bb2f340f25a0cd21e14e0c25ed33409368a087e0ef51b1 SHA512 56ad41adf76ff0b932e997a6d173e414d675c790da592b90c6a77b807dc57c4e03962dcd2100a080426bfd316b707a3854caa41c9ef9f42177e7a2aa22b41a2e
diff --git a/dev-ruby/ultraviolet/metadata.xml b/dev-ruby/ultraviolet/metadata.xml
deleted file mode 100644
index e85a4a576c75..000000000000
--- a/dev-ruby/ultraviolet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">grosser/ultraviolet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
deleted file mode 100644
index 1b0344cdae18..000000000000
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-RUBY_FAKEGEM_EXTRAINSTALL="render"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A syntax highlighting engine based on Textpow"
-HOMEPAGE="https://github.com/grosser/ultraviolet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/textpow-1.3.0"
-
-all_ruby_prepare() {
-	sed -i -e '/rdoc_patter/d' Rakefile || die
-	sed -i -e '/git ls-files/d' ultraviolet.gemspec || die
-}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 008ebcf913d9..6cee670b1355 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,8 +1,6 @@
-DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
 DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
 DIST vcr-6.1.0.tar.gz 153296 BLAKE2B b34fbb88458bca2faef0b7bc801f664eb7b1ed79c09362f0fd1ed25da9d768098721cb45edbf6801cc63d9c78c8d615ef8d468daf5757043cd130de2b7029859 SHA512 62ab8abfe8e0dff391df4e8874bf10315aa58baef1cc28bb60e5fd63a207bb054a3b253dbfc9ad32dfdfe7d832557c262cb0139178fb778b77150def77214a68
-EBUILD vcr-4.0.0.ebuild 757 BLAKE2B ce86dd663d034dcfdd9f8b4a6ffbc1a9f6b58c74df593a47527fa1cebcaff490e6a10b41cc15e9c1a157d7e25dd8fae80ac2a1d706df1bdd6fec03527c036603 SHA512 f55409b5672d06bebccca4eb81b04e169d625db21fd43005c6ec1e50d339bdd37dbe3e5b416a1a11f3345586e9750e4f8fc02ad58205d6c4de6d04f2c2d1d4a1
 EBUILD vcr-5.1.0.ebuild 780 BLAKE2B ee40daa44cadcd4fc1045aa744dfea2aa9da0c882ed516af5123e3d0f1779892375fd134c0b5592cdf9200fea902f1dec8e5417545397ec7fca62811417bc71d SHA512 bdcb20c50b26f81de30067208fa60c31575c97083ba2e4ce5ca6493e4bbacabb46d4571838311b984cec4973b44eb31d0d36de84449de0028e87a9a39c037254
 EBUILD vcr-6.0.0.ebuild 780 BLAKE2B 2d407c697feeab2b539811f874f22c18f0545ddf2876b00ce1baf6accc62f54bd6fffe587e2ac7c71d2a86f3908a56f5dc1e2bb53c5e3926c12717c1a7b04e16 SHA512 a9257d928c39bb5ce6e7af37cc489c7252e267d3daea4bf4aa4309d72f23557fff088ddc1cdaa4be4c439c0fe9c5b2aa3af3120ddeeded7ed680680a85009229
 EBUILD vcr-6.1.0.ebuild 787 BLAKE2B 86f03f9aba475ea196e81beb645c85e3c0e1c0746d277f00fcdcc7c74a76480b88afb60a167dd50920549b08b1bea584441ef43710eefc9cfcb5300f97dda2e9 SHA512 dd6c3c790df8afe6e58c19b67869350237daa49edbdd5a8dc285fecb5a93ad2760639e420b02d6570a07777d82aaa2f00ab50156329cef04eef4b63981a3c0c2
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
deleted file mode 100644
index b1ef57cf7675..000000000000
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="3"
-IUSE="json test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
-
-ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6702ff0a12cb..a48bbeca1db1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 46b5483da5ba..a7e61022fbcf 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,10 +1,8 @@
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc
-DIST patch-5.19.8.xz 695676 BLAKE2B 3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c SHA512 16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161
 DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
-EBUILD bpftool-5.19.12.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
-EBUILD bpftool-5.19.8.ebuild 3168 BLAKE2B 0ef2a5fb36ccfdb04d29cfa7e797452565eaf13bbdaaf4d8e5a1c15a1e4e69ea98417fa26c8584ff17d399f790d858b4bb0dca0d556f744bd021fb01b904750e SHA512 75e743abd5ac2cf81d681a82e2f7d493585005297538f4a9e833bff71b7dde55dd384931a7acec905e168a18b21c55ae504bd4c428a60cb37e0f2a0a0d1d8cbf
+EBUILD bpftool-5.19.12.ebuild 3168 BLAKE2B 351b96e5a84c5092851d263a652718af688447a9c067f9b0143181647f73b65f77b2362ce8ca6097d9321b92a232f372faa65f378069aa17582a798ba1446d58 SHA512 7ed135f2c56b981b526fce29001c902f9bde1f2f3b240f5966457b78c035e98ebed440b2cf6091a6340855faff63620a5c4b15f0775f2d8dcf2c92dbe836723a
 EBUILD bpftool-6.0.12.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.19.12.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild
index 3b2b5a406a29..276c46117bea 100644
--- a/dev-util/bpftool/bpftool-5.19.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/bpftool/bpftool-5.19.8.ebuild b/dev-util/bpftool/bpftool-5.19.8.ebuild
deleted file mode 100644
index 43dec802c6e2..000000000000
--- a/dev-util/bpftool/bpftool-5.19.8.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="caps"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	pushd "${S_K}" >/dev/null || die
-	# Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00`
-	# bug #868123
-	eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches
-	popd || die
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		feature-libcap="$(usex caps 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
deleted file mode 100644
index 6ae29b61f557..000000000000
--- a/dev-util/patchbin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 962 BLAKE2B bdcaa52af4ac329e25d0ab2f2b12a54b659ccaa1984221661e384a02654891a48f925e317649de7aa8f6cd28bcb02d593fc9a46da4cfba4363da899f5d1a24d7 SHA512 5f43f7b6b7cf5f3d512ba8a1d1fcc68714a1cff1c339ad307b3bce277addf051f02b0e49fa0d5ff2b6eaec4848ebef079e5a0be9b1a113558b697e30038d8b6f
-EBUILD patchbin-99999999.ebuild 964 BLAKE2B de5dcd0d66bf7688088dddf12ede4c3d9c8b7b193a4ccc1aafab65be7b193aa4d5430b5c51b8c62530198dfae8a9544001910075813b98d993cbfef5d11b86e3 SHA512 32293afd7cde3e8d26d6b12c2bcf193cec76de93bb72d1dd4fc086720cc046b1a87a812e9bc41ac8549447ad8c2951322c3c5dd3d6d2800f8f0a1f4761838ba3
-MISC metadata.xml 365 BLAKE2B 3d6db56763e0b6dd71be3051e38518a8c2206a27779fde59c44e3f565e4e72edc78cd880cf39cbe613ffca7e455347b634089d2f58347331006aa88561e3889f SHA512 a111b2ca5eec0b25f4564a76b567a9af67049e9b502cba04c7bbc9b2884dc18bf65bbf96ee0b8811ad50e4cbed9d5fb727aae396a37a8001bb8358a11c7d49e1
diff --git a/dev-util/patchbin/metadata.xml b/dev-util/patchbin/metadata.xml
deleted file mode 100644
index 9ee474bf7c50..000000000000
--- a/dev-util/patchbin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">wine-compholio/wine-staging</remote-id>
-		<maintainer>
-			<name>Sebastian Lackner</name>
-			<email>sebastian@fds-team.de</email>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
deleted file mode 100644
index b28b64c40823..000000000000
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-else
-	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
-	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/wine-staging-${SHA}"
-fi
-
-DESCRIPTION="Apply binary patches without git"
-HOMEPAGE="https://github.com/wine-compholio/wine-staging"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="
-	app-shells/bash
-	sys-apps/coreutils
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/util-linux
-	sys-devel/patch
-"
-
-src_prepare() {
-	mv patches/gitapply.sh ${PN} || die
-	sed -E -i "s/(\.\/)?gitapply(\.sh)?/${PN}/g" ${PN} || die
-
-	default
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${PN}
-}
-
-pkg_postinst() {
-	einfo "${PN} can optionally use dev-util/git to apply patches if installed."
-}
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
deleted file mode 100644
index 90587e649d76..000000000000
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 99999999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging"
-else
-	SHA="4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c"
-	SRC_URI="https://github.com/wine-compholio/wine-staging/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/wine-staging-${SHA}"
-fi
-
-DESCRIPTION="Apply binary patches without git"
-HOMEPAGE="https://github.com/wine-compholio/wine-staging"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-RDEPEND="
-	app-shells/bash
-	sys-apps/coreutils
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/util-linux
-	sys-devel/patch
-"
-
-src_prepare() {
-	mv patches/gitapply.sh ${PN} || die
-	sed -E -i "s/(\.\/)?gitapply(\.sh)?/${PN}/g" ${PN} || die
-
-	default
-}
-
-src_install() {
-	exeinto /usr/bin/
-	doexe ${PN}
-}
-
-pkg_postinst() {
-	einfo "${PN} can optionally use dev-util/git to apply patches if installed."
-}
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index afadf4d6e80b..a14f05bad817 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -6,5 +6,5 @@ DIST ply-2.3.0-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d
 DIST ply-2.3.0.tar.gz 79753 BLAKE2B 7c2f71a6078ff65ce92b3959c3dac31d44fcf3b99fc0b2d0390152fcdfcb5f1620090b26a47f6579aaa7b7644700f2865e2693707e8746cdd78c77ce66e9ead1 SHA512 ee8acd31bef7b2ac318ef64f7775aae2b288bae15a7b7b5b28c2ce5728e8ece7833ce192bd10488dd54228685d3dc9053679a033960ed75fd91a10bb0fa6d912
 EBUILD ply-2.1.1-r1.ebuild 1204 BLAKE2B 391dfeadb5a7fefa1f4b300d3529fde460adfe29b3195d1ba1a686a9340c02e94273bb373e5b2820e6785804b93cb67cc675c26413f7e81fdeba61069d10e890 SHA512 90e5ba22c0f1af30e52f7df0634951e031bfd21f8de40a9273cbb0eb0f66a35c8a6b43cf1a7de470d89029fe29924c9afda44349c99740cc790c035e0805b2fb
 EBUILD ply-2.2.0.ebuild 1159 BLAKE2B b031ec88a988219c0dc9dcd4171b27cfb78a92d00678b7f23e9fabeca41c63f2d6be0221baf5a5602297f5353018db4a830449e51285f6d4d49530ac2b3282ac SHA512 bfe505b29eb37aebf3e76bbb05932147a52fb1a8b06f6950ca9db824913859ce227f8be860562d4a14c991349f00a823548f509ee0b70c698ebfef8babdbfbde
-EBUILD ply-2.3.0.ebuild 1166 BLAKE2B 42da8e6ce887cbe7208bdae3b69479624edf1d23db159535b25f1cbfb1cf2bd28be3002eab3a945c27cc1dd97ee7e330621321725bce6635c8a17fddb49f768a SHA512 05f226ceb6b5c04330ca4ddb93d748eb1ca9ca0090285c8912c3b681a80907344a37ba9160613bd94b3d9a5a631c59d9eac629a3289c1b5bcba273bbde46d1a7
+EBUILD ply-2.3.0.ebuild 1164 BLAKE2B 55c693a636c0de30cc6d15c9209ab7d829eafc4c313f411351829f93a2f794f5889e3fcbb1d0b62f48485e4a74d16dd420b32721a283ff3c615d6b2499f4a4db SHA512 02055ed434ce349d417e79acc859d48d72082d1f010e4b884983c472f27b63b8bb046163ac1b6bf5f85392a852a52820553291881efa80ec58483a44c2fd2dcf
 MISC metadata.xml 417 BLAKE2B 28ebd45dbaf6cca1bb15bbf344ed122b15f1925ce45a0d74b408c512a9116f767508e7aba47798f6becc5bbaa647fa74dec5153c1c82783fbba336b6eeafab62 SHA512 cd1f87108a632e8741bc85eeb949f75cc7a7375aa472b0bfa1fdc421e25056178ce565b1eb64047e5c26dae0642e9038f586fbe356b162e8a957d71d7b37117b
diff --git a/dev-util/ply/ply-2.3.0.ebuild b/dev-util/ply/ply-2.3.0.ebuild
index f5bbba6567e2..75f6c6489eb5 100644
--- a/dev-util/ply/ply-2.3.0.ebuild
+++ b/dev-util/ply/ply-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv"
 IUSE="static-libs"
 # Bug 733248 file collisions with sys-boot/plymouth:
 # /usr/lib64/libply.la
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 16afdcb1c169..7bb7e95510da 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-pimp/Manifest b/dev-vcs/git-pimp/Manifest
deleted file mode 100644
index a5f619befe0b..000000000000
--- a/dev-vcs/git-pimp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST git-pimp-0.8.tar.gz 10555 BLAKE2B d6fa64b4cff6734661b22fe8b69d552dc405c702e36abd3b7fb309ad489602facd099828b021bc813dca88b8e29c258b5be56abceebcb9d5f85c035af6d93c86 SHA512 124b61001c088685d5d9d6f848d37ca170413fda08074a273a4c1bccd233fe606028d8de82c66ae7847f42008b82a6030fa47a493ddc47b65d02b69a1acbd7df
-EBUILD git-pimp-0.8.ebuild 588 BLAKE2B ac6c912878030641516884014bad72414d61feac866826b3555cb705dc93aa4eb6f1aec1ae535d540b9e8634f7e5549345086a0efcfac8d5c9ac4ef38b05d7d9 SHA512 810141e02d65efdcba94624254386ad66327010799a9c05f89bbce82f1f84908042e3ec820b0a0a6689739799e2a6525f94a37f1f40925f8e860191493dd1901
-MISC metadata.xml 256 BLAKE2B cbe5f8a797fefb855f4accb978b785677ddb78482da3eafb43d8b4ce85c1fadc5bbdaeaab3523563b9a966518e7b75710de7c0bb7f31995a43bf7f09ee82a611 SHA512 be0864c3ee74df84f72b82854b77a586da8f04f0a5a0f0beabdf8fb20155b9406bc3b4e198e4f9dd1399962693fcff7fc7dea78fdf11426927947f4cca064c4a
diff --git a/dev-vcs/git-pimp/git-pimp-0.8.ebuild b/dev-vcs/git-pimp/git-pimp-0.8.ebuild
deleted file mode 100644
index 8e86e781023d..000000000000
--- a/dev-vcs/git-pimp/git-pimp-0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Code review or pull requests as patch email series"
-HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/"
-
-SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( dev-util/cram )"
-RDEPEND="
-	dev-vcs/git
-	app-shells/zsh
-	dev-vcs/git-mailz
-	dev-vcs/git-mantle
-"
-
-src_install() {
-	# Do not install in /usr/local
-	emake PREFIX="${ED}/usr" install
-	einstalldocs
-}
diff --git a/dev-vcs/git-pimp/metadata.xml b/dev-vcs/git-pimp/metadata.xml
deleted file mode 100644
index d93823a7c4d3..000000000000
--- a/dev-vcs/git-pimp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="github">roman-neuhauser/git-mailz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 520ec8b3db25..6dd58f1e3ba3 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
deleted file mode 100644
index 8e110a8b27c4..000000000000
--- a/games-strategy/netherearth/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
-AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
-AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
-AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
-AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
-AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
-DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
-DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
-EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
-MISC metadata.xml 531 BLAKE2B 6dc83ec972a85b81462b118b6051f7f64d24cca6fc18d7440563f36f287eb94f1f1a7db5d580945cc47a08260abcdc5f76b493dc5531381e1cad8d03b3361c19 SHA512 b397128d9dd4d29831073d59b1ac6cfed688be59befc8a9a6af717d342f59bcbd575832ad5af5fc761b7a3f4527ad588cdf241bbc2f103d4120271208fd9af67
diff --git a/games-strategy/netherearth/files/Makefile b/games-strategy/netherearth/files/Makefile
deleted file mode 100644
index 07c671a10e31..000000000000
--- a/games-strategy/netherearth/files/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# ls *.cpp
-#
-#3dobject-ase.cpp  construction.cpp  maps.cpp         netherdebug.cpp    radar.cpp
-#3dobject.cpp      enemy_ai.cpp      menu.cpp         nethersave.cpp     robot_ai.cpp
-#bitmap.cpp        glprintf.cpp      myglutaux.cpp    particles.cpp      robots.cpp
-#bullet.cpp        main.cpp          nether.cpp       piece3dobject.cpp  shadow3dobject.cpp
-#cmc.cpp           mainmenu.cpp      nethercycle.cpp  quaternion.cpp     vector.cpp
-
-
-SOURCES = 3dobject-ase.cpp 3dobject.cpp cmc.cpp nether.cpp piece3dobject.cpp vector.cpp bitmap.cpp bullet.cpp glprintf.cpp main.cpp mainmenu.cpp maps.cpp menu.cpp myglutaux.cpp nethercycle.cpp netherdebug.cpp nethersave.cpp particles.cpp construction.cpp quaternion.cpp radar.cpp enemy_ai.cpp robot_ai.cpp robots.cpp shadow3dobject.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-TARGET = nether_earth
-
-.cpp.o:
-	g++ ${CXXFLAGS} -c $< -o $@
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECTS)
-	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
deleted file mode 100644
index b61e1f139b04..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -8,6 +8,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <GL/glut.h>
- #include "SDL/SDL.h"
- #include "SDL/SDL_mixer.h"
- 
-@@ -144,6 +145,7 @@
-     bool quit = false;
- 
- 	load_configuration();
-+	glutInit(&argc, argv);
- 
- 	screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0));
- 	if (screen_sfc==0) return 0;
diff --git a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch b/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
deleted file mode 100644
index 25f99be50fab..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp ./3dobject-ase.cpp
---- ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp	2002-10-26 00:00:00.000000000 +0300
-+++ ./3dobject-ase.cpp	2004-04-16 21:42:55.000000000 +0300
-@@ -34,7 +34,7 @@
- 	char buffer[256];
- 	FILE *fp;
- 
--	fp=fopen(file,"r+");
-+	fp=fopen(file,"r");
- 	if (fp==NULL) return false;
- 
- 	/* Look for the materials: */ 
-diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp ./3dobject.cpp
---- ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp	2004-01-06 20:49:00.000000000 +0200
-+++ ./3dobject.cpp	2004-04-16 21:43:44.000000000 +0300
-@@ -74,7 +74,7 @@
- 
- 	int *smooth;
- 
--	fp=fopen(file,"r+");
-+	fp=fopen(file,"r");
- 	if (fp==NULL) return false;
- 
- 	/* Importar un fichero .ASC de 3DStudio */ 
-diff -ud ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp ./bitmap.cpp
---- ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp	2004-01-06 20:49:00.000000000 +0200
-+++ ./bitmap.cpp	2004-04-16 21:45:13.000000000 +0300
-@@ -14,7 +14,7 @@
- 	g=0;
- 	b=0;
- 
--	fp=fopen(file,"rb+");
-+	fp=fopen(file,"rb");
- 	if (fp==NULL) return;
- 
- 	/* Tag: */ 
-diff -ud ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp ./mainmenu.cpp
---- ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp	2004-01-06 20:50:00.000000000 +0200
-+++ ./mainmenu.cpp	2004-04-16 21:14:14.000000000 +0300
-@@ -6,6 +6,9 @@
- #include <dirent.h>
- #endif
- 
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include "string.h"
- #include "stdio.h"
- #include "math.h"
-@@ -483,8 +486,10 @@
- {
- 	int v;
- 	FILE *fp;
-+	char cfg_path[300];
- 
--	fp=fopen("nether.cfg","r");
-+	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
-+	fp=fopen(cfg_path,"r");
- 	if (fp==0) return;
- 
- 	if (2!=fscanf(fp,"%i %i",&SCREEN_X,&SCREEN_Y)) return;
-@@ -510,8 +515,12 @@
- void save_configuration(void)
- {
- 	FILE *fp;
-+	char cfg_path[300];
- 
--	fp=fopen("nether.cfg","w");
-+	sprintf(cfg_path, "%s/.netherearth", getenv("HOME"));
-+	mkdir(cfg_path, 0755);
-+	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
-+	fp=fopen(cfg_path,"w");
- 	if (fp==0) return;
- 
- 	fprintf(fp,"%i %i\n",SCREEN_X,SCREEN_Y);
-diff -ud ../NetherEarth_v0.51-linsrc.orig/nether.cpp ./nether.cpp
---- ../NetherEarth_v0.51-linsrc.orig/nether.cpp	2004-01-06 21:03:00.000000000 +0200
-+++ ./nether.cpp	2004-04-16 20:54:54.000000000 +0300
-@@ -1203,7 +1203,7 @@
- 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);
- 						       else glColor3f(0.5,0.5,1.0);
- 			glTranslatef(0,-2,0);
--			sprintf(filename,"savedgame%i.txt",i);
-+			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);
- 			fp=fopen(filename,"r");
- 			if (fp==0) {
- 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);
-@@ -1232,7 +1232,7 @@
- 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);
- 						       else glColor3f(0.5,0.5,1.0);
- 			glTranslatef(0,-2,0);
--			sprintf(filename,"savedgame%i.txt",i);
-+			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);
- 			fp=fopen(filename,"r");
- 			if (fp==0) {
- 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);
-@@ -1291,7 +1291,7 @@
- 			case 4:
- 				{
- 					char filename[80];
--					sprintf(filename,"savedgame%i.txt",option_menu-1);
-+					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);
- 					save_game(filename);
- 					//save_debug_report("debugreport.txt");
- 					game_state=STATE_PAUSE;
-@@ -1326,7 +1326,7 @@
- 			case 4:
- 				{
- 					char filename[80];
--					sprintf(filename,"savedgame%i.txt",option_menu-1);
-+					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);
- 					killmenu(act_menu);
- 					load_game(filename);
- 					newmenu(act_menu);
-diff -ud ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp ./nethersave.cpp
---- ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp	2003-09-17 00:00:00.000000000 +0300
-+++ ./nethersave.cpp	2004-04-16 21:23:04.000000000 +0300
-@@ -2,6 +2,10 @@
- #include "windows.h"
- #endif
- 
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include "string.h"
- #include "stdio.h"
- #include "math.h"
-@@ -40,7 +44,10 @@
- 	ROBOT *r;
- 	BULLET *bul;
- 	EXPLOSION *e;
-+	char tmp_path[300];
- 
-+	sprintf(tmp_path, "%s/.netherearth", getenv("HOME"));
-+	mkdir(tmp_path, 0755);
- 	fp=fopen(filename,"w");
- 	if (fp==0) return false;
- 
diff --git a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
deleted file mode 100644
index 813f963db4c8..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/335137
-
---- sources/mainmenu.cpp
-+++ sources/mainmenu.cpp
-@@ -3,6 +3,7 @@
- #else
- #include <stddef.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <dirent.h>
- #endif
- 
---- sources/nethersave.cpp
-+++ sources/nethersave.cpp
-@@ -1,5 +1,8 @@
- #ifdef _WIN32
- #include "windows.h"
-+#else
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #endif
- 
- #include "string.h"
diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
deleted file mode 100644
index 7d81f912764f..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
-+++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
-@@ -17,4 +17,4 @@
- all: $(TARGET)
- 
- $(TARGET): $(OBJECTS)
--	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
-+	g++ $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread
diff --git a/games-strategy/netherearth/files/netherearth-0.52-linux.patch b/games-strategy/netherearth/files/netherearth-0.52-linux.patch
deleted file mode 100644
index 6c4c0d1e9733..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-linux.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -burN sources/glprintf.cpp sources-linux/glprintf.cpp
---- sources/glprintf.cpp	2002-10-26 00:17:00.000000000 +0200
-+++ sources-linux/glprintf.cpp	2005-06-18 18:22:54.000000000 +0200
-@@ -3,6 +3,7 @@
- #endif
- #include "GL/gl.h"
- 
-+#include "string.h"
- #include "stdio.h"
- #include "stdarg.h"
- #include "GL/gl.h"
-diff -burN sources/list.h sources-linux/list.h
---- sources/list.h	2002-10-27 12:17:00.000000000 +0100
-+++ sources-linux/list.h	2005-06-18 18:21:34.000000000 +0200
-@@ -1,6 +1,9 @@
- #ifndef GENERIC_LIST
- #define GENERIC_LIST
- 
-+
-+#include "stdlib.h"
-+
- /* 
- Funciones para LISTAS: 
- 
-diff -burN sources/maps.cpp sources-linux/maps.cpp
---- sources/maps.cpp	2005-05-05 23:42:00.000000000 +0200
-+++ sources-linux/maps.cpp	2005-06-18 18:23:05.000000000 +0200
-@@ -3,6 +3,7 @@
- #endif
- 
- #include "stdio.h"
-+#include "string.h"
- 
- #include "GL/gl.h"
- #include "GL/glu.h"
-diff -burN sources/myglutaux.cpp sources-linux/myglutaux.cpp
---- sources/myglutaux.cpp	2002-10-26 00:17:00.000000000 +0200
-+++ sources-linux/myglutaux.cpp	2005-06-18 18:23:29.000000000 +0200
-@@ -5,6 +5,8 @@
- #include <GL/gl.h>
- #include "GL/glut.h"
- 
-+#include "string.h"
-+#include "stdlib.h"
- #include "stdio.h"
- #include "math.h"
- #include "vector.h"
diff --git a/games-strategy/netherearth/metadata.xml b/games-strategy/netherearth/metadata.xml
deleted file mode 100644
index b8124ddf943a..000000000000
--- a/games-strategy/netherearth/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Nether Earth was the very first real time strategy game. It worked on a
-		SPECTRUM machine, and only needed 48KB of RAM to work!! It has all the
-		typical elements of strategy games: resources, factories, combat units,
-		etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/netherearth/netherearth-0.52-r1.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
deleted file mode 100644
index e1aa7cabaaac..000000000000
--- a/games-strategy/netherearth/netherearth-0.52-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_PV="${PV/./}"
-DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
-HOMEPAGE="http://www.braingames.getput.com/nether/"
-SRC_URI="http://www.braingames.getput.com/nether/sources.zip
-	http://www.braingames.getput.com/nether/${PN}${MY_PV}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.6-r3
-	>=media-libs/sdl-mixer-1.2.5-r1
-	media-libs/freeglut
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/sources"
-
-data="../nether earth v${PV}"
-
-src_unpack() {
-	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
-	unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die
-}
-
-src_prepare() {
-	default
-
-	DATA_DIR=/usr/share/${PN}
-
-	cp "${FILESDIR}/Makefile" . || die
-
-	# Fix compilation errors/warnings
-	eapply "${FILESDIR}"/${P}-linux.patch
-
-	eapply "${FILESDIR}"/${P}-freeglut.patch \
-		"${FILESDIR}"/${P}-glibc-212.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# Modify dirs and some fopen() permissions
-	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
-	sed -i \
-		-e "s:models:${DATA_DIR}/models:" \
-		-e "s:textures:${DATA_DIR}/textures:" \
-		-e "s:maps/\*:${DATA_DIR}/maps/\*:" \
-		-e "s:\./maps:${DATA_DIR}/maps:" \
-		mainmenu.cpp || die
-	sed -i \
-		-e "s:models:${DATA_DIR}/models:g" \
-		-e "s:textures:${DATA_DIR}/textures:" \
-		-e "s:sound/:${DATA_DIR}/sound/:" \
-		nether.cpp || die
-	sed -i -e "s:maps:${DATA_DIR}/maps:" \
-		main.cpp || die
-	sed -i -e "s:textures/:${DATA_DIR}/textures/:" \
-		myglutaux.cpp || die
-
-	cd "${data}"
-	rm textures/thumbs.db
-}
-
-src_install() {
-	dobin nether_earth
-
-	cd "${data}"
-
-	# Install all game data
-	insinto "${DATA_DIR}"
-	doins -r maps models sound textures
-
-	dodoc readme.txt
-
-	newicon textures/nuclear.bmp ${PN}.bmp
-	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6daad0d80a1f..85a9ba1d4413 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index e132c3c7582b..314efbd47a04 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.12.3.tar.xz 659136 BLAKE2B 2b9878b93c46be37fc7cfaf9ffadf58a84445b2e081c712a9824f323b0aee5725fd0b229a0a073afd0a7e3354d418669c411e02ac0f98a4e2eeaff9c19f6f93c SHA512 00d186aa3e5a184b5fe985909118fe856c7889e6674d55de6fe409f04ccac0a8698ef8063a2049e8b100ea0e9abfa5f89c959333a18cd6f934608b86f256ee5d
 DIST chafa-1.12.4.tar.xz 934272 BLAKE2B 57009e5b6c8cbb41643e94d224e9a4a7e3c2839ee79a6d4949b6d872ab9e10ab66fe7a609f448cad68ee930e5da84e31a1368c8f7ad6457c4c1583971f87f91e SHA512 2732ff380fc6d61124298ae3d9958d676fe6ca2887ee11df057d4efa6f4ae9c074a7e1920a6a3db1ffb21882432769967f4453d52a0344e581993984133a0e9b
 EBUILD chafa-1.12.3.ebuild 751 BLAKE2B 620759963bbe5fa317ad60b080f9138bc9cd1c151cb8ce5c2d6c2d5bd6d774ded495d3956fb6e5d4427740804e91cd326f5257f265f4dec0cdb9b3ec7666e262 SHA512 5c7fee149c9b2130f1d8678b83364257d3209ee3d25bcf4d497b000eb8d75cb2a872117322aa2c1037aea6f0620ae5caf0d45a1c0695d4adf57d877cbd07c47e
-EBUILD chafa-1.12.4.ebuild 754 BLAKE2B b3e92b1cd0f3c81e8626c27031e091ae76e044e15c03d38e1ac9d156a058941deb4a4dca69feca321207ed0738f8e4b0d3a955da340a5fcfd82b9f5be6778c5b SHA512 b9f94e704afcd7177e75c861b0ba9527e974dcb3105cd154ffa98f4a3d288fca9d2c2df360158e336a973fb222ba86fb57559b1fe0c4a767a3624608bdb54c26
+EBUILD chafa-1.12.4.ebuild 752 BLAKE2B 6e46a2dc78c578f3b3cde886b567fc584c9560363b04d8da723d1c5562468c59576e934bbdacdae1fc3c49f76c11dada9b468afa836a5e2aad7691b9ce1f1f24 SHA512 f2386a30bd41e977197b5556e8261da760f67490ad3bbde646c40201b202fbfa1d8c50c0b47ebeedaa1700e58e71c055a643aaccc472311f92baf31d14a0608e
 MISC metadata.xml 396 BLAKE2B fc22be32275227f194b224a340dcd08e55a565fa68b102eb9cb55406402ed38d4f593aa6f59f3c40a24480c8d002ea0ce4a9a831055bb6821fdbe1a1dfd103ff SHA512 46617cd84ec16190865a896432df30443d31123b790d871bf634cd446b520ed9b1728951e49217b0619a91d0d46d3013ce7f41e142893298ad7e8c2522d1552d
diff --git a/media-gfx/chafa/chafa-1.12.4.ebuild b/media-gfx/chafa/chafa-1.12.4.ebuild
index 9a2b941734b1..ed240e8805d8 100644
--- a/media-gfx/chafa/chafa-1.12.4.ebuild
+++ b/media-gfx/chafa/chafa-1.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 43b5a7c08fa8..622a0d3a2c4c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index d9bb98d9b5b5..6ff92651c7c2 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-2.8.4.tar.gz 5108177 BLAKE2B 948eea724d725150ccf906c1e375e04be59f762fd6ebdb4660b6b036c87eaab803c8caebfa258efb0931e1610b8b75e9e3b00c0015e5520feca3dceec71683c2 SHA512 c024cf5706fe75648f0d3f9ef9ed3437f632454ab848c463135516d8c819cab52c42e1e9d4e050aeb254f6e08ae8345fbe0f95c0ab35fdc2f79e0c01c56b291c
 DIST picard-2.8.5.tar.gz 5108919 BLAKE2B 0866ece07a64ad1f226fa3d5b88ffca19eaa951e42918631fbe11ed64360f0c586dd0cfbfd33731c125b9db5a85a12263573e0cffdccf9e8e839ad197b5d9e4f SHA512 02bf3ce6b8503e0e4ed9601db4ba31019704d2e09d0abc36026f9cf6a81d748cf62fe0b6c1a2730fa89033d62823f62a40fed1d845abb54c51dd9bb8a0d1bfb4
 EBUILD picard-2.8.4.ebuild 1448 BLAKE2B 4f552c10b87ec6f0b2de583fb47310f134cc312f05dc0b3a3906aad7891d017be4cb175e9bb9bd24278fffd0ec98b6e2a086fb037fec9458b797e775476cdc51 SHA512 2fd18689766a347a81d488e90f8212174e51fe3bd6463349c70c5ea9b8304fc806fc156e10cb6aecc9ea11f851997bdc2a0ff0ed4009feb41604e9ea92b2f12f
-EBUILD picard-2.8.5.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
+EBUILD picard-2.8.5.ebuild 1448 BLAKE2B 8d6965bd4b1a22d74eef87959ac1b920999ef112eb33caa123257617301023bde79ef1f1e2e4ffced38a246ac8d09821b44f40b6f25709e41a6744c6dc1b0981 SHA512 fcf42700421b09c266e6df760861b445be1654e5718180e75c6b926cf5e28c153f6f23c931b31df1cc4d3939d6f357f48052d686551e266e46863909142a92ad
 EBUILD picard-9999.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.8.5.ebuild b/media-sound/picard/picard-2.8.5.ebuild
index e50d604072d8..4b8b04d7bf18 100644
--- a/media-sound/picard/picard-2.8.5.ebuild
+++ b/media-sound/picard/picard-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 18754ba40d7d..31d31e253c77 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -2,6 +2,6 @@ DIST rosegarden-22.06.tar.bz2 6514502 BLAKE2B d4ba13ac6b4cba6d0b5bc555933737d696
 DIST rosegarden-22.12.1.tar.bz2 6436465 BLAKE2B 76d193171dae451e9262f52679e2bad2f884d1edb48259ad9f33e573c56213124fa67194d100247a24ef363856d876096c5bfe4b3c4a2d17339d090778efccd5 SHA512 9195c20581edeae82934d1b89095791c39850dde34547bc26f2c63dd8272715ec7b2ca63eaae2b32c8de584df4845cb72a2fc8b3d866b958584ce3aabd1fd13c
 DIST rosegarden-22.12.tar.bz2 6434060 BLAKE2B 589863458b94876659ba64e65ff2e148aa7865c2d468bb7567fabf27af15f4026511bf6a2c06c103e73d0c94c7840146382261cb4952ae068605bdec05feaa6a SHA512 b9397ddd51bc2a2efa249377a61b8c14e902c495ebf52eb72f5083d10a5fc7136e249e8570f7110efb8acf3fbaae1b424e6bf33758168571ec407804ae8acdfe
 EBUILD rosegarden-22.06.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
-EBUILD rosegarden-22.12.1.ebuild 1135 BLAKE2B cdae8ff15f7bb2f7f8ffac044ae7a06c05f2d7084bd46e1d91055fd3c934e6a958cac6caa4ea43ed77a989a7b87a98830ff269c70969e3310b0a52f8259b8a94 SHA512 15c4e90ea5510374252f2583f5e4ca76147ecb655ccda904fa7ac2a8151a0fead5972e36eedca02d627a0553f220302e0639d6c2500ac17114ee3716964378da
+EBUILD rosegarden-22.12.1.ebuild 1133 BLAKE2B 14738ec3563af5974918050f26217ac8740ee8e97e1e2db7b1ada6e1763c2c0b9d048c6ae96df859eeeb334d1b1132e7f91d3f770ef0ad1f7e9a754f7f271b35 SHA512 469275335d14ca1a29bdd8becba5c7a770f04ac7c9453c62caeafb511bf2f39b69632c663b0c2bff607267f1d1f4b6a4b4663dca840af3b5ded4512ce0a53b28
 EBUILD rosegarden-22.12.ebuild 1135 BLAKE2B cdae8ff15f7bb2f7f8ffac044ae7a06c05f2d7084bd46e1d91055fd3c934e6a958cac6caa4ea43ed77a989a7b87a98830ff269c70969e3310b0a52f8259b8a94 SHA512 15c4e90ea5510374252f2583f5e4ca76147ecb655ccda904fa7ac2a8151a0fead5972e36eedca02d627a0553f220302e0639d6c2500ac17114ee3716964378da
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-22.12.1.ebuild b/media-sound/rosegarden/rosegarden-22.12.1.ebuild
index 2a8fc820cf59..3fb98de56855 100644
--- a/media-sound/rosegarden/rosegarden-22.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-22.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 793257eaede9..48e79bc0e0fa 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/nvidia-video-codec/Manifest b/media-video/nvidia-video-codec/Manifest
deleted file mode 100644
index 7d63d323341f..000000000000
--- a/media-video/nvidia-video-codec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nvidia-video-codec-8.2.16.tar.gz 51998 BLAKE2B 3692fe9d7d986e7f54285b57445d28531deb0a4119279a31320a01963d1498e5f080e167c38edfa51f17a8f78d769e92ff380e9a63576f069b10562a8ca03f92 SHA512 d144203b38f6a2e21f7dc0a73e4c2c4a2d2abccd56ae459df0daea0ac79db76af0e7ab2ecf87be8a56c4ebaf8a3fb0857bc6f59c22ab9c29638410742c4d835d
-EBUILD nvidia-video-codec-8.2.16.ebuild 540 BLAKE2B 06180170f102cf9c52d0774a25d06fe61401671184128990f5f6613c0e907042761c04c7d63980025e97c25a492c345a1bdf37a6ae6805c92120ef29bb03f87d SHA512 30bd0dddfc3f1bf76c863fdc5140179e44d6c2f0bc5faa2ebfe0e5c3d8705813a8f819cbb8af4b063533e68c80a1b0dc674e32f7fed32084510ac9213530985f
-MISC metadata.xml 323 BLAKE2B 937480de658b3d7b30ad284b40488f9933c4ca7f8568f1cf4c31a1f2006edb9f94aeefecd2c377b695a5a1453deeb6396af4e43c2200de2fb989d418661bb25d SHA512 f3ee348fe4f31520e28a9d548d1e70f0b004bcb16122d5b09572400b44846d89265610caef4cdc5c09f5e045d42c96acc4799ce9d4ba758bc6f3080589d7f69c
diff --git a/media-video/nvidia-video-codec/metadata.xml b/media-video/nvidia-video-codec/metadata.xml
deleted file mode 100644
index 1e7b357ecea8..000000000000
--- a/media-video/nvidia-video-codec/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">lu-zero/nvidia-video-codec</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild b/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild
deleted file mode 100644
index c168522364a6..000000000000
--- a/media-video/nvidia-video-codec/nvidia-video-codec-8.2.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Redistributable headers to build cuvid and nvenc"
-HOMEPAGE="https://github.com/lu-zero/nvidia-video-codec"
-SRC_URI="https://github.com/lu-zero/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-util/nvidia-cuda-toolkit-7.5
-		>=x11-drivers/nvidia-drivers-367.35"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/${PN}/include
-	doins *.h
-	dodoc README.md
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f3346f444074..c0594cbd4c7e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 74447015bb2c..3cfa59cf092f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 11:39:35 +0000
+Sun, 08 Jan 2023 17:39:37 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 76fb98a0d437..bbf30829d6be 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2023-01-08T11:39:39Z
+TIMESTAMP 2023-01-08T17:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6/91fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAAUw/+NEH2h7NrEE7/3ej0xKB8YYe7I43zb+e8anbpV5ZZmhKjeEMrqlArqViP
-MyKDZV0gfDr1ydKP4EFdrJJry020VVQqXpEscBhDV4nFfys9ZAZzJSosabg845jv
-FPVfNCENb0O3Ymfp0gBdaoLKXmj1o/BgDKfblRUUj59uuf2t8q8GgLkOTzThc+j5
-jnwxhkb2QhgbOGCDn7dhABJRBMS+HpcOpMFdo5LJZaUSMq1mMJaNYCpV9GzxVslo
-8GN5WVoaiEotSutQ1egrOwhzaRO66G7WRfRxJhUzYv8qCPWir3Le1AtORZGvbh/9
-lQ9QfDSchE77V38D+SXxdJn88NFSzGLDHCxKt0qXpgIjxqfXep13fAI+wBHgGlj4
-dG4KcObl+6R7TjXldXsxiFKZDAHlOohAfL4I1JgKnD2/cCjTte4XAtaOrObp9Uud
-NbX4gfdMMud1TyuByQ3DgcQy32ZrO/CfiCEPJsZ2PWg3R5iTZjb1VXpeAp4OkUJ4
-7QNAIpFSlUPPzx8OGmWheacw78bbKPu3GCsKZ6iy45a9LhYI6PZ+7zB7JnOlrJor
-wxtttcFd7T2eLg6HtXbRFOENfOJH8j6+ZlKEH3P7khuNMp9JNDXqanyjpDtSLNTS
-J0Cp5FGdtr/uW0wSk+u4VI4B3tu2GUom54yUG7+pEaUXJskqIA0=
-=1i0n
+klCYxQ//dS0Cnqsi7wIlSZCorJQPYHOzgjE1T4tlQMn9hsKCC9AREgTngI5sQ3tS
+WFUmxRb1ZRfKiOSobiOGLGKsh7NIUUJ+F+UvSX7KN29LMrODDBT5H3Xw/SrMuvLa
+mN2IqGIW7RHcW2TKucnGodMvbLMZKOtDsiyRFeG94YPuBIe740JrZ8m4gvZzrpaS
+L5aalEX+XYF5UjwictpgGsytCaCD94tRe1UivMFWLUEWqrX9b+PaCavaw8SNA6I8
+fU3E7HZHk/dYWaHUz/smKmg/UCM359JB8x1C6jA47+Y7KtHBmhOq6qag771mqppW
+hEgaeImBUXGLx2RqDXD5AU+0SMJoTbrqWQgC8ly4ra5f3ZKme7hoEYmMKwXxsnSf
++18zJNOlHd7Jtr7o9uQ06TabLONNgGs/JGsYJn0R12XDefylYTusKz1rDdb0gWbw
+04oQ3KfHfqwd9vTl7NbsFsSDr7YY60GMkShwjhBP8ovIcuhCs5t9FNxvUWHU5kv3
+81TtTKr2EiKUGBOOzAHHTS9oTgy7WH6zVBTMdVZkLS4PFJiWdz/SO40AqSWc/zLE
+wiYai3b26ZG8uewqv5unYGkzw7UEJeHyr0pWoVWFTl7KHWspUF3LOS0KEDcv4LWb
+S7arQjB/G3/natXYloXGmZEHZsUN2C5Zupw7ITd4ffJ/jVPuO4w=
+=jCW5
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 74447015bb2c..bf6f8ddac084 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 11:39:35 +0000
+Sun, 08 Jan 2023 17:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fa1c0c806cbd..5439d589ce40 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b88c18fe41ce..45ba53f1719a 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/mongosh-bin-1.3.1 b/metadata/md5-cache/app-admin/mongosh-bin-1.3.1
index ed77dbccd590..14aace94bb7e 100644
--- a/metadata/md5-cache/app-admin/mongosh-bin-1.3.1
+++ b/metadata/md5-cache/app-admin/mongosh-bin-1.3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=The MongoDB Shell
 EAPI=8
 HOMEPAGE=https://github.com/mongodb-js/mongosh https://www.mongodb.com/products/shell
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 ISC MIT WTFPL-2
 RDEPEND=dev-libs/cyrus-sasl[kerberos]
 SLOT=0
 SRC_URI=amd64? ( https://downloads.mongodb.com/compass/mongosh-1.3.1-linux-x64.tgz -> mongosh-1.3.1_x64.tgz ) arm64? ( https://downloads.mongodb.com/compass/mongosh-1.3.1-linux-arm64.tgz -> mongosh-1.3.1_arm64.tgz )
-_md5_=c7fdcb7209a58845c3fca3bbcab06095
+_md5_=8ed0654f55866e16bfdde9ce49260ae3
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 83c0e73df578..54f39fda01cd 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r8 b/metadata/md5-cache/app-editors/elvis-2.2.0-r8
deleted file mode 100644
index 1914895b199c..000000000000
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) X? ( x11-base/xorg-proto ) virtual/pkgconfig
-DESCRIPTION=A vi/ex clone
-EAPI=6
-HOMEPAGE=http://elvis.the-little-red-haired-girl.org
-INHERIT=versionator toolchain-funcs
-IUSE=X doc
-KEYWORDS=amd64 ppc ppc64 ~riscv x86 ~ppc-macos ~sparc-solaris
-LICENSE=Artistic
-RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
-SLOT=0
-SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=c26afac6616ceb7be7ae76a853282dc4
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 803899e1ee7c..36a2d7b78d1f 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-34 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
new file mode 100644
index 000000000000..dcc0f238b66a
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-34
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Handy scripts for ebuild development and more
+EAPI=8
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils !dev-util/pkgdiff
+SLOT=0
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v34.tar.gz -> mgorny-dev-scripts-34.tar.gz
+_md5_=72b7ec5a83d2547d1cb405290b5e1201
diff --git a/metadata/md5-cache/app-portage/tatt-0.10 b/metadata/md5-cache/app-portage/tatt-0.10
index 29ed66ca8a22..49a44bebac4d 100644
--- a/metadata/md5-cache/app-portage/tatt-0.10
+++ b/metadata/md5-cache/app-portage/tatt-0.10
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/gentoo/tatt
 INHERIT=distutils-r1
 IUSE=+templates python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=app-portage/eix app-portage/gentoolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-portage/nattka[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-client/pybugz python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/tatt/archive/v0.10.tar.gz -> tatt-0.10.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f14b42184244ea4191e644f5cd16ddfb
+_md5_=7a4d1d7dd72f636e0a77339cb834a169
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5a44dd692c51..8f6eb4088d43 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r2 b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
deleted file mode 100644
index 56911923d7b4..000000000000
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Alf's PDF Viewer Like Vim
-EAPI=7
-HOMEPAGE=https://github.com/naihe2010/apvlv/
-INHERIT=xdg cmake desktop
-IUSE=debug djvu
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
-SLOT=0
-SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=de74c8238c69a96c998067df0058837c
diff --git a/metadata/md5-cache/app-text/zathura-0.5.2 b/metadata/md5-cache/app-text/zathura-0.5.2-r1
index 187583c72131..8419b9108d54 100644
--- a/metadata/md5-cache/app-text/zathura-0.5.2
+++ b/metadata/md5-cache/app-text/zathura-0.5.2-r1
@@ -10,7 +10,7 @@ KEYWORDS=~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
-SLOT=0
+SLOT=0/0.5
 SRC_URI=https://github.com/pwmt/zathura/archive/0.5.2.tar.gz -> zathura-0.5.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0156c801027f4a5248ade12ce358c5c1
+_md5_=51bd6b8c474568d22e516002ce502f25
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index e59da99846a8..60d6fd86486b 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura/
 INHERIT=meson virtualx xdg git-r3
-IUSE=doc +magic seccomp sqlite synctex test test
+IUSE=doc seccomp sqlite synctex test test
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=>=dev-libs/girara-0.3.6 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RDEPEND=>=dev-libs/girara-0.3.7 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 sys-apps/file seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 RESTRICT=!test? ( test )
-SLOT=0
+SLOT=0/9999
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=199f6d15b31b66f345f9384025de5827
+_md5_=51bd6b8c474568d22e516002ce502f25
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1
new file mode 100644
index 000000000000..3562ea2c9503
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.3.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9:= dev-libs/girara dev-libs/glib:2
+DESCRIPTION=PDF plug-in for zathura
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
+INHERIT=meson xdg-utils
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9:= dev-libs/girara dev-libs/glib:2
+SLOT=0
+SRC_URI=https://github.com/pwmt/zathura-pdf-poppler/archive/0.3.1.tar.gz -> zathura-pdf-poppler-0.3.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b32d242e25d949b23cf7872be8bdafbf
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index ed3ca8da0f29..4d46fa0f8bd9 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
+DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9:= dev-libs/girara dev-libs/glib:2
 DESCRIPTION=PDF plug-in for zathura
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/zathura-pdf-poppler
 INHERIT=meson xdg-utils git-r3
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
+RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9:= dev-libs/girara dev-libs/glib:2
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74329be8e93fd816f50848bfebd4eb8a
+_md5_=b32d242e25d949b23cf7872be8bdafbf
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3351b84cb1b9..6d7c6b458987 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2 b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
index e536e16f1837..b80d16515cdf 100644
--- a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
+++ b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.mongodb.com
 INHERIT=check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
 IUSE=debug kerberos lto mongosh ssl +tools cpu_flags_x86_avx
-KEYWORDS=~amd64 ~arm64 -riscv
+KEYWORDS=amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=mongosh? ( app-admin/mongosh-bin ) tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r5.0.5.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3154dcdd575d3c575724794925b2f05f
+_md5_=2e88f5daf85468b003b293ee2cc82444
diff --git a/metadata/md5-cache/dev-db/sqlite-3.39.4 b/metadata/md5-cache/dev-db/sqlite-3.39.4
deleted file mode 100644
index 9a59361e0ebb..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.39.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=7
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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 ~loong ~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=public-domain
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3390400.zip doc? ( https://sqlite.org/2022/sqlite-doc-3390400.zip )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8728d6779171d14eb625392b54e506c2
diff --git a/metadata/md5-cache/dev-db/sqlite-3.40.0 b/metadata/md5-cache/dev-db/sqlite-3.40.0
deleted file mode 100644
index 569dc3d25061..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.40.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/tcl-8.6:0 app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=8
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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 ~loong ~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=public-domain
-RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3400000.zip doc? ( https://sqlite.org/2022/sqlite-doc-3400000.zip )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2191e624afa2e5342ae4bdf38829c767
diff --git a/metadata/md5-cache/dev-db/sqlite-3.40.1 b/metadata/md5-cache/dev-db/sqlite-3.40.1
index a0d23bbad677..fff390b22687 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.40.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.40.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sqlite.org/
 INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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 ~loong ~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 ~loong ~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=public-domain
 RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2022/sqlite-src-3400100.zip doc? ( https://sqlite.org/2022/sqlite-doc-3400100.zip )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=55da4efe911855ad3b3fc3694955d194
+_md5_=040edd2b9097819cd5fd9cb2f0d9bed4
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f619df69bf90..45b3c8216ba8 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/asm-9.4 b/metadata/md5-cache/dev-java/asm-9.4
index d45201bc3bf6..ae67e6832961 100644
--- a/metadata/md5-cache/dev-java/asm-9.4
+++ b/metadata/md5-cache/dev-java/asm-9.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://asm.ow2.io
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_4/asm-ASM_9_4.tar.bz2
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4d4163ff63e8131606443c6034fdcf88
+_md5_=560eae2836a947534e74130a5012b87c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d8dc731ba82c..2272e727472b 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ispc-1.18.0 b/metadata/md5-cache/dev-lang/ispc-1.18.0
index 46e7ac728228..6c69296e2ee1 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.18.0
+++ b/metadata/md5-cache/dev-lang/ispc-1.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://ispc.github.io/
 INHERIT=cmake python-any-r1 llvm
 IUSE=examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD BSD-2 UoI-NCSA
 RDEPEND=<sys-devel/clang-15:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.18.0.tar.gz -> ispc-1.18.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0db0a2d14348107bfe70cbd597962278
+_md5_=b63768ed1aab23994deb26a57338329a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8fbc0df6b4a3..2e5905aee5e7 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/astroid-2.13.1 b/metadata/md5-cache/dev-python/astroid-2.13.1
new file mode 100644
index 000000000000..319acc5c61f9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.13.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.13.1.tar.gz -> astroid-2.13.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2c5a9e7f0fe8dee06a6bfed73ba87707
diff --git a/metadata/md5-cache/dev-python/cleo-0.8.1-r1 b/metadata/md5-cache/dev-python/cleo-0.8.1-r1
deleted file mode 100644
index 69ed632f0b9d..000000000000
--- a/metadata/md5-cache/dev-python/cleo-0.8.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/clikit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/crashtest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tool for building testable command-line interfaces
-EAPI=8
-HOMEPAGE=https://github.com/python-poetry/cleo/ https://pypi.org/project/cleo/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-poetry/cleo/archive/0.8.1.tar.gz -> cleo-0.8.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fccc2d6775f0fac485a186d9f6573c9d
diff --git a/metadata/md5-cache/dev-python/cleo-1.0.0 b/metadata/md5-cache/dev-python/cleo-1.0.0
deleted file mode 100644
index 699e75182ff6..000000000000
--- a/metadata/md5-cache/dev-python/cleo-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/crashtest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rapidfuzz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tool for building testable command-line interfaces
-EAPI=8
-HOMEPAGE=https://github.com/python-poetry/cleo/ https://pypi.org/project/cleo/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
-LICENSE=MIT
-RDEPEND=dev-python/crashtest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rapidfuzz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-poetry/cleo/archive/1.0.0.tar.gz -> cleo-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c2398aa7377dbad39f0847aef025bed0
diff --git a/metadata/md5-cache/dev-python/cleo-2.0.1 b/metadata/md5-cache/dev-python/cleo-2.0.1
index e803eb76c785..bcfd1508faeb 100644
--- a/metadata/md5-cache/dev-python/cleo-2.0.1
+++ b/metadata/md5-cache/dev-python/cleo-2.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-poetry/cleo/ https://pypi.org/project/cleo/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/crashtest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rapidfuzz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-poetry/cleo/archive/2.0.1.tar.gz -> cleo-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9f57bf69902ca6e5d3376d69c8d212e2
+_md5_=2eb218e952ced27735d102f468643ae2
diff --git a/metadata/md5-cache/dev-python/coverage-7.0.4 b/metadata/md5-cache/dev-python/coverage-7.0.4
new file mode 100644
index 000000000000..e5d12398c1bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-7.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/coverage/coverage-7.0.4.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=8dafb9f7e1b3d621d7aa0660e2c6fc38
diff --git a/metadata/md5-cache/dev-python/django-tables2-2.5.1 b/metadata/md5-cache/dev-python/django-tables2-2.5.1
new file mode 100644
index 000000000000..df4836fe46c9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-tables2-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/django-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/django-filter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Table/data-grid framework for Django
+EAPI=8
+HOMEPAGE=https://pypi.org/project/django-tables2/ https://github.com/jieter/django-tables2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/django-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jieter/django-tables2/archive/v2.5.1.tar.gz -> django-tables2-2.5.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=7724688e645adb8c0be63fa24c9c05ab
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.11.0-r1 b/metadata/md5-cache/dev-python/google-api-core-2.11.0-r1
new file mode 100644
index 000000000000..81b2afe4917a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-core-2.11.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?] dev-python/proto-plus[python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?] ) test? ( >=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.5[python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core Library for Google Client Libraries
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/python-api-core/ https://pypi.org/project/google-api-core/ https://googleapis.dev/python/google-api-core/latest/index.html
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/googleapis-common-protos-1.56.2[python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.5[python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/python-api-core/archive/v2.11.0.tar.gz -> python-api-core-2.11.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=cfe47fb88ca6e52a61735e4f3ae7fa0a
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.71.0-r1 b/metadata/md5-cache/dev-python/google-api-python-client-2.71.0-r1
new file mode 100644
index 000000000000..875f32675a70
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.71.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.71.0.tar.gz -> google-api-python-client-2.71.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=cc1f5c0cf61b96433d3ed07936c1e783
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r2 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r2
new file mode 100644
index 000000000000..3649343dc07e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=httplib2 Transport for Google Auth
+EAPI=8
+HOMEPAGE=https://pypi.org/project/google-auth-httplib2/ https://github.com/googleapis/google-auth-library-python-httplib2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/httplib2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/google-auth[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-httplib2/archive/v0.1.0.tar.gz -> google-auth-library-python-httplib2-0.1.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6928a3c6ccaa2b5f1f75f668968e6f72
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.8.0-r2 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.8.0-r2
new file mode 100644
index 000000000000..4a488f01582f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.8.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python-oauthlib/ https://pypi.org/project/google-auth-oauthlib/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v0.8.0.tar.gz -> google-auth-library-python-oauthlib-0.8.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=4bcd9b25aad4a6a880d77de7365b1c32
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.61.3 b/metadata/md5-cache/dev-python/hypothesis-6.61.3
new file mode 100644
index 000000000000..33c89043c47c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.61.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.61.3.tar.gz -> hypothesis-6.61.3.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2c7cd258f4acdcf6880150edf3a23223
diff --git a/metadata/md5-cache/dev-python/iniconfig-2.0.0 b/metadata/md5-cache/dev-python/iniconfig-2.0.0
new file mode 100644
index 000000000000..1f7e2fde6640
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iniconfig-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Brain-dead simple config-ini parsing
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/iniconfig/ https://pypi.org/project/iniconfig/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/iniconfig/archive/v2.0.0.tar.gz -> iniconfig-2.0.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=68b998b7005ed91f2e5243c20dcc2613
diff --git a/metadata/md5-cache/dev-python/libcloud-3.7.0 b/metadata/md5-cache/dev-python/libcloud-3.7.0
new file mode 100644
index 000000000000..aa2b024c8ace
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libcloud-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/cryptography-2.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lockfile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unified Interface to the Cloud - python support libs
+EAPI=8
+HOMEPAGE=https://libcloud.apache.org/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/libcloud/apache-libcloud-3.7.0.tar.bz2
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d546f7ab3455f02092c4ecb5ba3bc96d
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.0.3 b/metadata/md5-cache/dev-python/mkdocs-material-9.0.3
new file mode 100644
index 000000000000..0789ded00197
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.0.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material-extensions[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.0.3.tar.gz -> mkdocs-material-9.0.3.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	docs	314e509c51630fb75f120d62a77d008c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=22c48e0cdf7b8575eae307c2dc13be40
diff --git a/metadata/md5-cache/dev-python/networkx-3.0 b/metadata/md5-cache/dev-python/networkx-3.0
new file mode 100644
index 000000000000..3fbd48695629
--- /dev/null
+++ b/metadata/md5-cache/dev-python/networkx-3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/lxml-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/numpy-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/numpy-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/numpy-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/numpy-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python tools to manipulate graphs and complex networks
+EAPI=8
+HOMEPAGE=https://networkx.org/ https://github.com/networkx/networkx/ https://pypi.org/project/networkx/
+INHERIT=distutils-r1 optfeature multiprocessing virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/networkx/networkx-3.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=26d8077e93379317340b7bd377008638
diff --git a/metadata/md5-cache/dev-python/nox-2022.11.21 b/metadata/md5-cache/dev-python/nox-2022.11.21
index 136020506da6..a3cf75b914a1 100644
--- a/metadata/md5-cache/dev-python/nox-2022.11.21
+++ b/metadata/md5-cache/dev-python/nox-2022.11.21
@@ -1,4 +1,4 @@
-BDEPEND=test? ( <dev-python/argcomplete-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/argcomplete-1.9.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/colorlog-7.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorlog-2.6.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/argcomplete-3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/argcomplete-1.9.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/colorlog-7.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorlog-2.6.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flexible test automation for Python
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wntrblm/nox/archive/2022.11.21.tar.gz -> nox-2022.11.21.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=82af0a0cc815c2fa13420c114480ae37
+_md5_=d89f022d6f79fca55b293b45db3fc8eb
diff --git a/metadata/md5-cache/dev-python/prettytable-3.6.0 b/metadata/md5-cache/dev-python/prettytable-3.6.0
new file mode 100644
index 000000000000..78a81b633e0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prettytable-3.6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) dev-python/pytest-lazy-fixture[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easily displaying tabular data in a visually appealing ASCII table format
+EAPI=8
+HOMEPAGE=https://github.com/jazzband/prettytable/ https://pypi.org/project/prettytable/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jazzband/prettytable/archive/3.6.0.tar.gz -> prettytable-3.6.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=a225413cd26ec656e8ecfa0c5927bf82
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.22.1-r1 b/metadata/md5-cache/dev-python/proto-plus-1.22.1-r1
new file mode 100644
index 000000000000..ba781d5989da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/proto-plus-1.22.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/google-api-core-1.31.5[python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_10(-)?] ) test? ( <dev-python/protobuf-python-5[python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Beautiful, Pythonic protocol buffers
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/proto-plus-python/ https://pypi.org/project/proto-plus/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_10
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/protobuf-python-5[python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.22.1.tar.gz -> proto-plus-1.22.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=dac42b78abab76afdbecdcae5fc4baf9
diff --git a/metadata/md5-cache/dev-python/redis-py-4.4.1 b/metadata/md5-cache/dev-python/redis-py-4.4.1
new file mode 100644
index 000000000000..43d2e2fa1c84
--- /dev/null
+++ b/metadata/md5-cache/dev-python/redis-py-4.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Redis key-value store
+EAPI=8
+HOMEPAGE=https://github.com/redis/redis-py/ https://pypi.org/project/redis/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/redis/redis-py/archive/v4.4.1.tar.gz -> redis-py-4.4.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2c722c3ae9a524438820baf3e970d1f3
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.3 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.3
new file mode 100644
index 000000000000..c07c2fdbdec8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx extension which outputs Apple help book
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinxcontrib-applehelp/ https://pypi.org/project/sphinxcontrib.applehelp/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=BSD-2
+PDEPEND=>=dev-python/sphinx-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sphinx-doc/sphinxcontrib-applehelp/archive/1.0.3.tar.gz -> sphinxcontrib-applehelp-1.0.3.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6afb3dc0a1eda788a0002d53e6f67477
diff --git a/metadata/md5-cache/dev-python/svglib-1.5.1 b/metadata/md5-cache/dev-python/svglib-1.5.1
new file mode 100644
index 000000000000..1829b6f49777
--- /dev/null
+++ b/metadata/md5-cache/dev-python/svglib-1.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cssselect2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/reportlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure-Python library for reading and converting SVG
+EAPI=8
+HOMEPAGE=https://github.com/deeplook/svglib/ https://pypi.org/project/svglib/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/cssselect2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/reportlab[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/deeplook/svglib/archive/v1.5.1.tar.gz -> svglib-1.5.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=8851db2d890058f84b4ec551a7220caf
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ef89aad44aa9..bb1aaf31e322 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/dalli-3.2.3 b/metadata/md5-cache/dev-ruby/dalli-3.2.3
index 253a014ef598..4a2fcdd38624 100644
--- a/metadata/md5-cache/dev-ruby/dalli-3.2.3
+++ b/metadata/md5-cache/dev-ruby/dalli-3.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/petergoldstein/dalli
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v3.2.3.tar.gz -> dalli-3.2.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=65f20cf7796025ad723d014aebba7bb3
+_md5_=7bfc7d52c844dc3305ee08e96f4d6359
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.17.3 b/metadata/md5-cache/dev-ruby/faraday-0.17.3
deleted file mode 100644
index c3592ba7418b..000000000000
--- a/metadata/md5-cache/dev-ruby/faraday-0.17.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby27(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=HTTP/REST API client library with pluggable components
-EAPI=7
-HOMEPAGE=https://github.com/lostisland/faraday
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lostisland/faraday/archive/v0.17.3.tar.gz -> faraday-0.17.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3761d51ab1e70a1413da2be8fd3493ef
diff --git a/metadata/md5-cache/dev-ruby/git-1.11.0 b/metadata/md5-cache/dev-ruby/git-1.11.0
deleted file mode 100644
index cf338734ae20..000000000000
--- a/metadata/md5-cache/dev-ruby/git-1.11.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/minitar[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=Library for using Git in Ruby
-EAPI=8
-HOMEPAGE=https://github.com/schacon/ruby-git
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby27? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rchardet-1.8:1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/schacon/ruby-git/archive/v1.11.0.tar.gz -> git-1.11.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=79b5c75c5402cef3c7fcc4bc98228866
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.6.0 b/metadata/md5-cache/dev-ruby/hipchat-1.6.0
deleted file mode 100644
index fbae7eec4355..000000000000
--- a/metadata/md5-cache/dev-ruby/hipchat-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/httparty[ruby_targets_ruby27(-)] dev-ruby/mimemagic:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rr[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby library to interact with HipChat
-EAPI=6
-HOMEPAGE=https://github.com/hipchat/hipchat-rb
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/httparty[ruby_targets_ruby27(-)] dev-ruby/mimemagic:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.6.0.tar.gz -> hipchat-1.6.0.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=89fdc656c756246e03ce9f424dd3b054
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
deleted file mode 100644
index 8114a99b9336..000000000000
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=IO::Buffer is a byte queue which is intended for non-blocking I/O applications
-EAPI=7
-HOMEPAGE=https://github.com/tarcieri/iobuffer
-INHERIT=multilib ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tarcieri/iobuffer/archive/v1.1.2.tar.gz -> iobuffer-git-1.1.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4f2748d9cb7c13cb13c62b4b2a492024
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
deleted file mode 100644
index 9d23686e04ad..000000000000
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rainbow:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/paramesan[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A module that adds logging/trace functionality
-EAPI=6
-HOMEPAGE=https://github.com/jpace/logue
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rainbow:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jpace/logue/archive/v1.0.18.tar.gz -> logue-git-1.0.18.tgz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
deleted file mode 100644
index 89e3e0760e9e..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby27(-)] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-INHERIT=ruby-fakegem
-IUSE=ed25519 test test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby27(-)] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.2.0.tar.gz -> net-ssh-git-5.2.0.tgz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ed002f949b3e4b262a06ca0b637ed7a4
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1 b/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
deleted file mode 100644
index 0d9624d3b434..000000000000
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Parse and decompose a domain name into top level domain, domain and subdomains
-EAPI=7
-HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/public_suffix-3.1.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c0255de1017037823ce09499ef81da56
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-3.11.0
index 6b90dea66ddd..3d8c0d8e68ed 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.11*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.11*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.11*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-core-3.11*[ruby_targets_ruby30(-)] =dev-ruby/rspec-expectations-3.11*[ruby_targets_ruby30(-)] =dev-ruby/rspec-mocks-3.11*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/rspec-core-3.11*[ruby_targets_ruby31(-)] =dev-ruby/rspec-expectations-3.11*[ruby_targets_ruby31(-)] =dev-ruby/rspec-mocks-3.11*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.11.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9dca351aedfa0c554d84b6ca0c49f640
+_md5_=9427f4a7357d556eaaf2d81aeec348cc
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
index b4707919315c..cb6c11ca07e1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.11.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-core
 INHERIT=ruby-fakegem
 IUSE=highlight test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby30(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby31(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.11.0.tar.gz -> rspec-core-3.11.0-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3b252d52e776b8fa47586b718ad36dcb
+_md5_=f78259fea580a22ed97c9d15c481d4cb
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
index 9f52fda4b554..cc51eb5b258c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.11.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.11*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] =dev-ruby/rspec-support-3.11*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] =dev-ruby/rspec-support-3.11*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.11.1.tar.gz -> rspec-expectations-3.11.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=878b1bc766474f2e7285cc0dadab7398
+_md5_=f54cd48f6eabccc458d6a4a3c2169367
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
index fe8da388c671..199476bd56b7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.11.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby30(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/rspec-support-3.11*[ruby_targets_ruby31(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby31(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.11.2.tar.gz -> rspec-mocks-3.11.2-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=168d718f3de301dcf25c4f146f6c12f7
+_md5_=84d3ad28e0bbc13fe6ac3860304b3d25
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2 b/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
deleted file mode 100644
index e594d69afa38..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby27(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby27(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby27(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby27(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/railties:5.2[ruby_targets_ruby27(-)] ) >=dev-ruby/rspec-3.10:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby27(-)] >=dev-ruby/ammeter-1.1.5[ruby_targets_ruby27(-)] ~dev-ruby/rspec-rails-4.1.2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=RSpec's official Ruby on Rails plugin
-EAPI=7
-HOMEPAGE=https://rspec.info/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( || ( dev-ruby/activesupport:6.0[ruby_targets_ruby27(-)] dev-ruby/activesupport:5.2[ruby_targets_ruby27(-)] ) || ( dev-ruby/actionpack:6.0[ruby_targets_ruby27(-)] dev-ruby/actionpack:5.2[ruby_targets_ruby27(-)] ) || ( dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/railties:5.2[ruby_targets_ruby27(-)] ) >=dev-ruby/rspec-3.10:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=4
-SRC_URI=https://github.com/rspec/rspec-rails/archive/v4.1.2.tar.gz -> rspec-rails-4.1.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fb64696049e4f4768219a6ddea99c670
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2 b/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
deleted file mode 100644
index 013edcbb68f0..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Retry intermittently failing rspec examples
-EAPI=7
-HOMEPAGE=https://github.com/NoRedInk/rspec-retry
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/rspec-retry-0.6.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=125efda5f6f5f16fc36d57e07deb0623
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.11.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
index 8d53ad2a0aa2..fd66ebf9bc16 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.11.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rspec/rspec-support
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.11.1.tar.gz -> rspec-support-3.11.1-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8835dca52e197efa1749d1a04ef42a1e
+_md5_=357f48f8bc5ae8e0f1dd06ad47caa4d3
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
deleted file mode 100644
index fb8a907a0349..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=7
-HOMEPAGE=https://github.com/seleniumhq/selenium
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby27(-)] >=dev-ruby/rubyzip-1.2.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/selenium-webdriver-3.142.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0dc5c57347aa3d8c1f8757a67713d0a4
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1 b/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
deleted file mode 100644
index fd5d65d5713b..000000000000
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A library to parse and process Textmate bundles
-EAPI=8
-HOMEPAGE=http://textpow.rubyforge.org/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1503fb45cfdd723e74c292e37289dac8
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
deleted file mode 100644
index e5cbc55cbe62..000000000000
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A syntax highlighting engine based on Textpow
-EAPI=7
-HOMEPAGE=https://github.com/grosser/ultraviolet
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ultraviolet-1.0.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c164f78dc8fd28d1025f07d47ede8939
diff --git a/metadata/md5-cache/dev-ruby/vcr-4.0.0 b/metadata/md5-cache/dev-ruby/vcr-4.0.0
deleted file mode 100644
index ea7a7aba248e..000000000000
--- a/metadata/md5-cache/dev-ruby/vcr-4.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby27? ( json? ( dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Records your test suite's HTTP interactions and replay them during test runs
-EAPI=6
-HOMEPAGE=https://github.com/vcr/vcr/
-INHERIT=ruby-fakegem
-IUSE=json test test ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( json? ( dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/vcr/vcr/archive/v4.0.0.tar.gz -> vcr-4.0.0.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=88030277d71136d556fda8610ebf4504
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c2a1424c739e..ada5c903b777 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bpftool-5.19.12 b/metadata/md5-cache/dev-util/bpftool-5.19.12
index fd0eacf118f6..ff89dbf61b25 100644
--- a/metadata/md5-cache/dev-util/bpftool-5.19.12
+++ b/metadata/md5-cache/dev-util/bpftool-5.19.12
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kernel.org/
 INHERIT=estack linux-info optfeature python-any-r1 toolchain-funcs
 IUSE=caps
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2273fceee795784ae5cd84d64afcff66
+_md5_=356f6ff84886184f2501f78e888d94be
diff --git a/metadata/md5-cache/dev-util/bpftool-5.19.8 b/metadata/md5-cache/dev-util/bpftool-5.19.8
deleted file mode 100644
index 9e59c262bfac..000000000000
--- a/metadata/md5-cache/dev-util/bpftool-5.19.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchutils || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-python/docutils
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= ) >=sys-kernel/linux-headers-5.8
-DESCRIPTION=Tool for inspection and simple manipulation of eBPF programs and maps
-EAPI=8
-HOMEPAGE=https://kernel.org/
-INHERIT=estack linux-info optfeature python-any-r1 toolchain-funcs
-IUSE=caps
-KEYWORDS=amd64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.8.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9e38ff024453d9f42218ec7f6fe2fd8a
diff --git a/metadata/md5-cache/dev-util/patchbin-20160208 b/metadata/md5-cache/dev-util/patchbin-20160208
deleted file mode 100644
index e02fd60a2dc3..000000000000
--- a/metadata/md5-cache/dev-util/patchbin-20160208
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Apply binary patches without git
-EAPI=6
-HOMEPAGE=https://github.com/wine-compholio/wine-staging
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/util-linux sys-devel/patch
-SLOT=0
-SRC_URI=https://github.com/wine-compholio/wine-staging/archive/4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c.tar.gz -> patchbin-20160208.tar.gz
-_md5_=ee9557d7b9a08efe0e66abf9ce929ac9
diff --git a/metadata/md5-cache/dev-util/patchbin-99999999 b/metadata/md5-cache/dev-util/patchbin-99999999
deleted file mode 100644
index d9e6a4c61184..000000000000
--- a/metadata/md5-cache/dev-util/patchbin-99999999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Apply binary patches without git
-EAPI=6
-HOMEPAGE=https://github.com/wine-compholio/wine-staging
-INHERIT=git-r3
-LICENSE=LGPL-2.1
-PROPERTIES=live
-RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/util-linux sys-devel/patch
-SLOT=0
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=a1a6f8c5ddc39a1061bcf06f0d987e3d
diff --git a/metadata/md5-cache/dev-util/ply-2.3.0 b/metadata/md5-cache/dev-util/ply-2.3.0
index c7a16b6b5167..5215a840c482 100644
--- a/metadata/md5-cache/dev-util/ply-2.3.0
+++ b/metadata/md5-cache/dev-util/ply-2.3.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/iovisor/ply
 INHERIT=autotools linux-info
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv
+KEYWORDS=amd64 ~arm ~arm64 ppc ~riscv
 LICENSE=GPL-2
 RDEPEND=!sys-boot/plymouth
 SLOT=0
 SRC_URI=https://github.com/iovisor/ply/archive/2.3.0.tar.gz -> ply-2.3.0.tar.gz https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ply-2.3.0-arm-build-fix.patch
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bace67196ffb39b795c68540bcef36ca
+_md5_=8fb1ecb3ffe6d7f35ec1204fd4bba3b8
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 144407694b96..b79936bc8d9c 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-pimp-0.8 b/metadata/md5-cache/dev-vcs/git-pimp-0.8
deleted file mode 100644
index c75fd0229042..000000000000
--- a/metadata/md5-cache/dev-vcs/git-pimp-0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=test? ( dev-util/cram )
-DESCRIPTION=Code review or pull requests as patch email series
-EAPI=6
-HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git app-shells/zsh dev-vcs/git-mailz dev-vcs/git-mantle
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-pimp/git-pimp-0.8.tar.gz
-_md5_=8d9d8b41ae03dcd2a6c0449a46ae2cc0
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index f1068b4b3e59..ebf52db63a0a 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/netherearth-0.52-r1 b/metadata/md5-cache/games-strategy/netherearth-0.52-r1
deleted file mode 100644
index 428bc380e197..000000000000
--- a/metadata/md5-cache/games-strategy/netherearth-0.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut app-arch/unzip
-DESCRIPTION=A remake of the SPECTRUM game Nether Earth
-EAPI=6
-HOMEPAGE=http://www.braingames.getput.com/nether/
-INHERIT=desktop
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://www.braingames.getput.com/nether/sources.zip http://www.braingames.getput.com/nether/netherearth052.zip
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=6dab8984b931ba946c6ddc566c3d816b
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0ffab06b31e9..a6f1910c7755 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/chafa-1.12.4 b/metadata/md5-cache/media-gfx/chafa-1.12.4
index b4df21957646..7c215338be16 100644
--- a/metadata/md5-cache/media-gfx/chafa-1.12.4
+++ b/metadata/md5-cache/media-gfx/chafa-1.12.4
@@ -5,9 +5,9 @@ DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
 EAPI=8
 HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
 IUSE=+tools
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
 SLOT=0
 SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.12.4.tar.xz
-_md5_=7d7c504ef00404766b69dba8dc9c4d30
+_md5_=48a82488b225369ddd74819af6e89809
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 101f795fcabb..6495fc43cab5 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/picard-2.8.5 b/metadata/md5-cache/media-sound/picard-2.8.5
index 8c921557adbb..d3a4bd6f6db7 100644
--- a/metadata/md5-cache/media-sound/picard-2.8.5
+++ b/metadata/md5-cache/media-sound/picard-2.8.5
@@ -6,7 +6,7 @@ HOMEPAGE=https://picard.musicbrainz.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=discid fingerprints nls test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/pyjwt[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] discid? ( dev-python/python-discid[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/pyjwt[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] discid? ( dev-python/python-discid[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/fasteners[python_targets_python3_11(-)] dev-python/pyjwt[python_targets_python3_11(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] discid? ( dev-python/python-discid[python_targets_python3_11(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.8.5.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b797b95e1db812044312590362655326
+_md5_=c5597d2b53fc853a8867883f8303f192
diff --git a/metadata/md5-cache/media-sound/rosegarden-22.12.1 b/metadata/md5-cache/media-sound/rosegarden-22.12.1
index 3ee6a2d94bff..79a92b5b82cd 100644
--- a/metadata/md5-cache/media-sound/rosegarden-22.12.1
+++ b/metadata/md5-cache/media-sound/rosegarden-22.12.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.rosegardenmusic.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg virtualx
 IUSE=lirc test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-22.12.1.tar.bz2
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=224349ac138be570c111de4423d0e170
+_md5_=b3a654e729d94f1a8788467b93f62e0b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 87547c1f7950..f005a16ef27b 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/nvidia-video-codec-8.2.16 b/metadata/md5-cache/media-video/nvidia-video-codec-8.2.16
deleted file mode 100644
index a47a553f26aa..000000000000
--- a/metadata/md5-cache/media-video/nvidia-video-codec-8.2.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-util/nvidia-cuda-toolkit-7.5 >=x11-drivers/nvidia-drivers-367.35
-DESCRIPTION=Redistributable headers to build cuvid and nvenc
-EAPI=6
-HOMEPAGE=https://github.com/lu-zero/nvidia-video-codec
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-util/nvidia-cuda-toolkit-7.5 >=x11-drivers/nvidia-drivers-367.35
-SLOT=0
-SRC_URI=https://github.com/lu-zero/nvidia-video-codec/archive/8.2.16.tar.gz -> nvidia-video-codec-8.2.16.tar.gz
-_md5_=3379831198ef4e0f80ec248972e4f1c4
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index e79d04f56a80..e78a52b42f8c 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/opendchub-0.8.2-r1 b/metadata/md5-cache/net-p2p/opendchub-0.8.2-r1
deleted file mode 100644
index 7c06d90cf23a..000000000000
--- a/metadata/md5-cache/net-p2p/opendchub-0.8.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl:= virtual/libcrypt:= perl? ( dev-lang/perl:= ) !perl? ( sys-libs/libcap )
-DESCRIPTION=hub software for Direct Connect
-EAPI=7
-HOMEPAGE=http://opendchub.sf.net
-INHERIT=autotools flag-o-matic
-IUSE=perl
-KEYWORDS=~amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:= virtual/libcrypt:= perl? ( dev-lang/perl:= ) !perl? ( sys-libs/libcap )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendchub/opendchub-0.8.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=16dd3d7e5ea43f7b505bfe492b107261
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 61c89c18e8c0..a7210550f920 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/acl2-8.5 b/metadata/md5-cache/sci-mathematics/acl2-8.5
index af86aa0cf16a..b031f42ace8a 100644
--- a/metadata/md5-cache/sci-mathematics/acl2-8.5
+++ b/metadata/md5-cache/sci-mathematics/acl2-8.5
@@ -12,4 +12,4 @@ REQUIRED_USE=emacs? ( doc )
 SLOT=0
 SRC_URI=https://github.com/acl2/acl2/archive/8.5/acl2-8.5.tar.gz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=7bd45a820710c19d7ef1fe519eac79e8
+_md5_=37c262df6c43768a59bd2aae74b28a1a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 43b9c57a593b..b2453f3b4f45 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/gpet-0.4-r1 b/metadata/md5-cache/sys-apps/gpet-0.4-r1
deleted file mode 100644
index 1083ba7e89a1..000000000000
--- a/metadata/md5-cache/sys-apps/gpet-0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=prepare
-DEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-DESCRIPTION=GTK+ based TOMOYO policy editor
-EAPI=7
-HOMEPAGE=http://en.sourceforge.jp/projects/gpet/
-INHERIT=autotools
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/gpet/53178/gpet-0.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=381f17fe7a12cfa0b82a33286d539969
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index cdffcce120db..c0373402e1a3 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1 b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
deleted file mode 100644
index 1b30ccdf8b07..000000000000
--- a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=An MBR that can handle BIOS-based boot on GPT
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/mbr-gpt_0.0.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=be199511e2d0d4d5bbfa672f28934398
diff --git a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r2 b/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r2
deleted file mode 100644
index 8a2d47953b91..000000000000
--- a/metadata/md5-cache/sys-boot/mbr-gpt-0.0.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=An MBR that can handle BIOS-based boot on GPT
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/mbr-gpt_0.0.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3fa8944750a53f479177679e0afb0855
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 80596e556b11..e4db75391497 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r2 b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
deleted file mode 100644
index 38fa6922108c..000000000000
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/gzip
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
-DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/automake/
-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=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=test
-SLOT=1.13
-SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
-_md5_=e37025e7ad6f3d5455f48d1acc3507d8
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r2 b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
deleted file mode 100644
index 6a850026f718..000000000000
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/gzip
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
-DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/automake/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=test
-SLOT=1.15
-SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
-_md5_=1d230d9dfdcd0e0a4bfb26515c98830f
diff --git a/metadata/md5-cache/sys-devel/bmake-20220901 b/metadata/md5-cache/sys-devel/bmake-20220901
deleted file mode 100644
index ddcee38bf495..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20220901
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=NetBSD's portable make
-EAPI=8
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20220901.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=99eb07fb2fd25cc17cdbe0675924da69
diff --git a/metadata/md5-cache/sys-devel/bmake-20220924 b/metadata/md5-cache/sys-devel/bmake-20220924
deleted file mode 100644
index b05ce492038a..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20220924
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=NetBSD's portable make
-EAPI=8
-HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20220924.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=697e26d90edf3d29e72aa3a3aed5ef1f
diff --git a/metadata/md5-cache/sys-devel/bmake-20220928 b/metadata/md5-cache/sys-devel/bmake-20220928
index d2f040ea08ee..79268582335c 100644
--- a/metadata/md5-cache/sys-devel/bmake-20220928
+++ b/metadata/md5-cache/sys-devel/bmake-20220928
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=NetBSD's portable make
 EAPI=8
 HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~loong ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~loong ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20220928.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=8f21ff92542d23da5cce07591b2b39ff
+_md5_=d581d5b38d9f7be5847b7334cc3d974d
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index b912866861cb..b69e27063216 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e3c547d48fedf5839d7fc581669ca393
+_md5_=12ee69890a42bf2eeab418ea675e1d9b
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
index 48229f011afe..334551002bae 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230101
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0_pre20230101
 SRC_URI=https://github.com/llvm/llvm-project/archive/b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz -> llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=571d624a8242c23b870e1fc6f58b59d2
+_md5_=7e773e5811ff4576381e87d88a081ede
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
index a2565339f225..7eda5fbab4d7 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20230107
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0_pre20230107
 SRC_URI=https://github.com/llvm/llvm-project/archive/6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz -> llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	578164f8fbf049db5b0a08076331b7de	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e3c547d48fedf5839d7fc581669ca393
+_md5_=12ee69890a42bf2eeab418ea675e1d9b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6991d47d7fad..3450dc6cc894 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.5 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.5
index 88aed46c5c72..c4c28a07ab9e 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-2.1.5
+++ b/metadata/md5-cache/sys-fs/mtd-utils-2.1.5
@@ -4,9 +4,9 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=8
 HOMEPAGE=https://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=+lzo xattr +zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:= sys-libs/zlib:= lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://infraroot.at/pub/mtd/mtd-utils-2.1.5.tar.bz2
-_md5_=e93c91d7b073695af414da5591a1c9c1
+_md5_=50e03eea348156296676ae36366670ce
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a5499ecec75e..889a1aef7d06 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/db-18.1.32-r1 b/metadata/md5-cache/sys-libs/db-18.1.32-r1
deleted file mode 100644
index f02e73415b28..000000000000
--- a/metadata/md5-cache/sys-libs/db-18.1.32-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Oracle Berkeley DB
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-INHERIT=db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-IUSE=doc cxx tcl test doc test examples 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 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( tcl )
-RESTRICT=!test? ( test )
-SLOT=18.1
-SRC_URI=https://download.oracle.com/otn/berkeley-db/db-18.1.32.tar.gz mirror://gentoo/db-18.1.32.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db	c42a9015ada022c979cd2ca4bc247821	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ca79ea2b2116255605fcac1749c1c909
diff --git a/metadata/md5-cache/sys-libs/db-18.1.40-r1 b/metadata/md5-cache/sys-libs/db-18.1.40-r1
deleted file mode 100644
index a873b7b350c4..000000000000
--- a/metadata/md5-cache/sys-libs/db-18.1.40-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Oracle Berkeley DB
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-INHERIT=db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-IUSE=doc cxx tcl test doc test examples 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( tcl )
-RESTRICT=fetch !test? ( test )
-SLOT=18.1
-SRC_URI=https://download.oracle.com/otn/berkeley-db/db-18.1.40.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db	c42a9015ada022c979cd2ca4bc247821	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4432161984ef2b21aa26c64ee370048e
diff --git a/metadata/md5-cache/sys-libs/db-6.1.38-r1 b/metadata/md5-cache/sys-libs/db-6.1.38-r1
deleted file mode 100644
index 54066c54cf33..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.1.38-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Oracle Berkeley DB
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-INHERIT=db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-IUSE=doc cxx tcl test doc test examples 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( tcl )
-RESTRICT=!test? ( test )
-SLOT=6.1
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.38.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db	c42a9015ada022c979cd2ca4bc247821	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8b7ea61aaf6839e02d6574fd81d9159d
diff --git a/metadata/md5-cache/sys-libs/db-6.2.38-r1 b/metadata/md5-cache/sys-libs/db-6.2.38-r1
deleted file mode 100644
index 31654a71a8b1..000000000000
--- a/metadata/md5-cache/sys-libs/db-6.2.38-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( >=sys-devel/binutils-2.16.1 ) kernel_SunOS? ( >=sys-devel/binutils-2.16.1 ) test? ( >=dev-lang/tcl-8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Oracle Berkeley DB
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
-INHERIT=db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-IUSE=doc cxx tcl test doc test examples 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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=AGPL-3
-RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( tcl )
-RESTRICT=!test? ( test )
-SLOT=6.2
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.38.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db	c42a9015ada022c979cd2ca4bc247821	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=be21ae2f939f13c0c8f7f93389040079
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index faf277e448c9..7121ad2d17da 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-3-r3 b/metadata/md5-cache/x11-themes/mate-themes-meta-3-r3
deleted file mode 100644
index 543b2057c121..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-meta-3-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package to facilitate easy use of x11-themes/mate-themes
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MATE
-IUSE=gtk2-only
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
-LICENSE=metapackage
-RDEPEND=|| ( gtk2-only? ( !!x11-libs/gtk+:3 x11-themes/mate-themes:0 ) ( >=x11-libs/gtk+-3.22:3 >=x11-themes/mate-themes-3.22.18 ) )
-SLOT=0
-_md5_=b966eecc165ad5f610a05686ea784947
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 328a9ccec0de..469ee15a2693 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-08T11:39:39Z
+TIMESTAMP 2023-01-08T17:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6q3tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO6/91fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDO0xAAoOHIW62730FTPp8KXWSTJqd5plRkzqg6WSxXExIqJhr/dLHPB172Bc9n
-ytFJGxEU/sUb5xn0ifKZAlwGgnGzYZ3wJ3xQ6beLqNYG+zmgPQ5O4QWN5k108ZlB
-vKFo/3CEo3cD0VkG0B9fXLlJIqCT8nJQw/8v6hvvJHN8ttZOO/al3jEUKRhJDLQk
-jqC3ZFh9kib+Fdwv1fQqE1pTAt41SsR+/qhtjBGR/MCA0EzerDaDbzIQvxbg0mvN
-GjlL6vnQFNCcXZLbSChAioSui+dejIaKd2zCeRAKt+bhdGBMdR3t/jckqT/dU5dT
-e3bMFkMdtYC3QxpGkm+c4IeQ/ck9IPOj8IM3JW5KXi1ecnsaAFhjIGpqH6Vp/qGP
-Y+5XWt+iPlpX3sSG0cuv7YI98pmYuS9D+sqDfYSR39smOOQgHphtUtlw+bDLmgJj
-j6WYupWCYfV7TVYFUS5lNjjySQFfJQS1SyehYEOHsyigNFK89M0an8yfMfEAbKVz
-MeOx6oFc8fBvCcR0JbZEUZFWOr0WL2CMdnZiJo2/j+FiP3hG62p3U12YggisDXIy
-SRLk80eG7Jdm44hncLzj/6fEcb6FFZCYBkO/K228qVmcugH/nGXUr6wKr0OgH/+z
-WKZHzGnIRdvJkmUO+sQQ0TCyKLBh2lkgv8RI/I+v4uBTsFtH5SI=
-=+6hU
+klDUsBAAm83tEXrpZ9Gy+gI/YSyNrC0jFRK/VxGjFiZUnLhF7g5Vet90f/PSKBhN
+y55BN4CgowpSKgz8lMPQcvs+tEylMnhDYiZSWXSh/fuc6j8VG4CiGXQgnHkUQ+VT
+YjkfBFjOvjizIk/QYrFwWvbaMaQMtP2g5s6Xamx0kKs6P4NRKot9goUsHv3Ot5i4
+EwI5lxihmZExtc8oID7YgvtIzXg5rpF9B25NLfNUz3BwelyU+Ho1MBKDu6WHtvOF
+wqlsLkaG6fZu3LwdEYPnbik85wbrc/fbVHQ+nEt1/mkiooNWbbOQmMaj4T0jiobG
+9x5me5BOax3sCgyK8CgACWlxb9d8rRTwMaqBbZ9LGMna6ZbarDWnadfic9Tlui5J
+K3FPTIdfPyCyIKKDvIyfX12xrf+0vO9vr4+ipIkUBkd7GGfYhKQ4vGoXH5qRQyTh
+vF4DW4E9nuuR3oCDIz51V2FFjiXumYcC3FhrII3q5gX+NixcDCISes2oRZkcapDM
+dj933YiXDYSbdR4CBNxKDlWbHJXqm+Yjgne8Gt+4cph8pv5YGqB/WTP5LGOjdjjk
+UpQOW956Qhuplsb8WVJONyEwKMgsXiAqyaTYWLIukUUNdS6gws2MFcexqYrhWLvP
+b8QzBJqhIe76RfOV2Y11wxXluIvvk/rnYDlwrfzX7760IIdFLS4=
+=BTHu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 74447015bb2c..bf6f8ddac084 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 11:39:35 +0000
+Sun, 08 Jan 2023 17:39:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5719ea3715a1..7a60198ae5c9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan  8 11:39:35 AM UTC 2023
+Sun Jan  8 05:39:37 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a2f9ba76dcda..da645452fdb0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 11:45:01 +0000
+Sun, 08 Jan 2023 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3f957d5a393f..f2d5b6c6312f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-359abfeacff09510a9e7908bcda032e258f07237 1673174482 2023-01-08T10:41:22+00:00
+c1e9380f8a7f1987d3fd891a84ec2614eb066f8f 1673198129 2023-01-08T17:15:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b93b72cf19db..1ca7eaf9273d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673178001 Sun 08 Jan 2023 11:40:01 AM UTC
+1673199601 Sun 08 Jan 2023 05:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 74447015bb2c..3cfa59cf092f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 08 Jan 2023 11:39:35 +0000
+Sun, 08 Jan 2023 17:39:37 +0000
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 85bdf68f4f79..600bf04d5ff7 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/opendchub/Manifest b/net-p2p/opendchub/Manifest
deleted file mode 100644
index 65167b89106d..000000000000
--- a/net-p2p/opendchub/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX opendchub-0.8.2-telnet.patch 347 BLAKE2B fdd3052d7b139bdee2398f0517ada047836f601d0b351055a34f4797d4f29d7e9f536d7b6fef5ff7a4f7dbcb18561aa286830b7aac13c30300af431e341f1a82 SHA512 b8b45dc232a2ca94bff9fc3ab8e80188a9072d38bad30233fab10292911d002e542c0dee58745a4c98c500866e748021a314ddc8abb42ebfd3a39e12cba177ae
-AUX opendchub_setup.sh 556 BLAKE2B a09a961a7dadde775fb066c15fa665fe70faa86af66547f312f780f0c86ff7428e5984618a87aa676b0c4380049e16b3d9c682af5033737dfcd26cae52932df4 SHA512 392b0cca686b8a8ba43eeca43b109616ef29af38ffec1ae02e0a10fb45986a3f6141485dca708abe103080b9a38c867b0120bcf9cd83deb8f6c220b919ae29eb
-DIST opendchub-0.8.2.tar.gz 188551 BLAKE2B a92be519386a6582c955b9b4bff9c6accff700bc3707935004cc7312726c28d026965046aad27a2dbef1005e514c47f6f61d9de86ad69e5ee3a705be8c94a4be SHA512 ccb8c5c44ee1e2f4704d681a2f4e0f9fe4035f1984744ca40665abbaa41e8faa7a03b96fe39ca47c9683b4f64b4e833c186681090ac80d82202e7f68e6cb52df
-EBUILD opendchub-0.8.2-r1.ebuild 1049 BLAKE2B 79e23cf6e795ab6f32769756b1f50e78e1ef4f6f222652c737b2a9a6ee0c8e15f8a1294442afbf928b795d58dad73ef2b0706e731f298ce2f1615ec1e36dce57 SHA512 7c6f5753ccf4a156d19b471f95817a59253e1eff84ee25015d03a1d584977e5abdd13a4af3b31e757465a20e60d24800a9ae0d52b548eb5467a0ed8f5ab539ad
-MISC metadata.xml 252 BLAKE2B aed1daae41d5714db3faa75d65fe31358339254150804eab500746212f1c025bd56fc99a5f423831bdca4fb5a526c523fecb7be5bd5797ad5dc2116411f96734 SHA512 b3d520a60f77bb245bfaf13fd9ead3313a5474d2baf4df3b897413a68f026be2263b643a1ac4a37eb28ddc539b53e725db40d9270c3af2bf07f6636966df26e8
diff --git a/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch b/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch
deleted file mode 100644
index c8efc525ed65..000000000000
--- a/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -1073,7 +1073,7 @@
- 	     /* The chat command, starts with <nick> */
- 	     else if(*temp == '<')
- 	       {
--		  if((user->type & (SCRIPT | UNKEYED | LINKED | NON_LOGGED)) == 0)
-+		  if((user->type & (SCRIPT | UNKEYED | LINKED | NON_LOGGED | NON_LOGGED_ADM)) == 0)
- 		    chat(temp, user);
- 	       }
- 	     
diff --git a/net-p2p/opendchub/files/opendchub_setup.sh b/net-p2p/opendchub/files/opendchub_setup.sh
deleted file mode 100644
index 2944a02c395e..000000000000
--- a/net-p2p/opendchub/files/opendchub_setup.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-if test ! -d $HOME/.opendchub; then
-	echo "creating config directory: $HOME/.opendchub"
-	mkdir $HOME/.opendchub
-	chmod 700 $HOME/.opendchub
-else
-	echo "$HOME/.opendchub already exists!"
-fi
-if test ! -d $HOME/.opendchub/scripts; then
-	echo "creating script directory: $HOME/.opendchub/scripts"
-	mkdir $HOME/.opendchub/scripts
-	chmod 700 $HOME/.opendchub/scripts;
-	echo "copying scripts..."
-	for i in /usr/share/opendchub/scripts/*; do
-		cp $i $HOME/.opendchub/scripts;
-	done
-else
-	echo "$HOME/.opendchub/scripts already exists!"
-fi
-echo "done!"
diff --git a/net-p2p/opendchub/metadata.xml b/net-p2p/opendchub/metadata.xml
deleted file mode 100644
index aa51b5df7f5d..000000000000
--- a/net-p2p/opendchub/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">opendchub</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-p2p/opendchub/opendchub-0.8.2-r1.ebuild b/net-p2p/opendchub/opendchub-0.8.2-r1.ebuild
deleted file mode 100644
index 36f50391ce0d..000000000000
--- a/net-p2p/opendchub/opendchub-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="hub software for Direct Connect"
-HOMEPAGE="http://opendchub.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="perl"
-
-RDEPEND="dev-libs/openssl:=
-	virtual/libcrypt:=
-	perl? ( dev-lang/perl:= )
-	!perl? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-telnet.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon
-	use perl || myconf="--disable-perl --enable-switch_user"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	dodoc -r Documentation/.
-
-	if use perl; then
-		dobin "${FILESDIR}"/opendchub_setup.sh
-		insinto /usr/share/opendchub/scripts
-		doins -r Samplescripts/.
-	fi
-}
-
-pkg_postinst() {
-	if use perl ; then
-		einfo "To set up perl scripts for opendchub to use, please run"
-		einfo "opendchub_setup.sh as the user you will be using opendchub as."
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bad7d99159f8..79437e1cbda4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 44be81852b0c..78dcd2cf8e0b 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -315,7 +315,6 @@ dev-libs/cudnn-frontend
 dev-python/pycuda
 dev-util/nvidia-cuda-sdk
 dev-util/nvidia-cuda-toolkit
-media-video/nvidia-video-codec
 dev-libs/optix
 x11-drivers/nvidia-drivers
 x11-misc/primus
diff --git a/profiles/package.mask b/profiles/package.mask
index 0ec7796ef02c..a219d974afa6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -905,11 +905,6 @@ dev-ruby/posix-spawn
 # Removal after 2023-02-01.  Bug #884715.
 dev-cpp/sourcetrail
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-12-10)
-# Fails to build with recent perl. No maintainer, no revdeps.
-# Removal in 30 days. Bug 849518
-net-p2p/opendchub
-
 # Sam James <sam@gentoo.org> (2022-12-09)
 # Breaks compilation of reverse dependencies with broken pkgconfig (pc) file
 # bug #885075, https://github.com/libarchive/libarchive/issues/1766
@@ -919,135 +914,21 @@ net-p2p/opendchub
 # mpc.h breaks compilation of reverse dependencies, reported upstream to ML
 =dev-libs/mpc-1.3.0
 
-# Michał Górny <mgorny@gentoo.org> (2022-12-09)
-# Unfetchable as the upstream homepage is gone, and mirror-restricted.
-# No package activity since 2018.
-# Removal on 2023-01-08.  Bug #668090.
-games-strategy/netherearth
-
 # Michał Górny <mgorny@gentoo.org> (2022-12-08)
 # Seems to break some logic in pkg_resources.  Masked for the time being
 # to prevent breakage.
 >=dev-python/packaging-22.0
 
-# Ionen Wolkens <ionen@gentoo.org> (2022-12-07)
-# Formerly added to apply binary git patches to wine-staging without git, but
-# has not been used since 2017 and stuck on EAPI-6. Alternatives: dev-vcs/git
-# Removal: 2023-01-06.
-dev-util/patchbin
-
-# Sam James <sam@gentoo.org> (2022-12-07)
-# HOMEPAGE & remote-id are for a different project, SRC_URI is gone,
-# only results on Google are for Gentoo mirrors, EAPI 6. Removal on 2023-01-07.
-# bug #630264, bug #655964, bug #750071.
-dev-vcs/git-pimp
-
-# Sam James <sam@gentoo.org> (2022-12-07)
-# These versions have been masked for testing since 2014(!). These versions
-# had a controversial licence change and therefore had limited adoption.
-# See also the old 2021-05-30-deprecate-old-bdb-slots news item for
-# additional context.
-# Removal on 2023-01-07.
-=sys-libs/db-6.1*
-=sys-libs/db-6.2*
-=sys-libs/db-18.1*
-
-# Naohiro Aota <naota@gentoo.org> (2022-12-07)
-# Masked for removal in 30 days. Depends on gnome-base/gconf. Last release
-# in 2011. See bug #873880.
-sys-apps/gpet
-
-# David Seifert <soap@gentoo.org> (2022-12-06)
-# EAPI 6, untouched for years, no revdeps. Removal on 2023-01-05.
-media-video/nvidia-video-codec
-
 # Sam James <sam@gentoo.org> (2022-12-06)
 # Broke C++ reverse dependencies. Please upgrade to 1.1.0-r1. See bug #884369.
 =x11-libs/libICE-1.1.0
 
-# Hans de Graaff <graaff@gentoo.org> (2022-12-05)
-# ruby27-only package. No longer maintained upstream. Last release in 2017.
-# No reverse dependencies. Removal in 30 days.
-dev-ruby/hipchat
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-05)
-# This package has been subsumed into its only consumer:
-# dev-ruby/nio4r. It is no longer developed, and its last standalone
-# release was 11 years ago. Removal in 30 days.
-dev-ruby/iobuffer
-
-# Marek Szuba <marecki@gentoo.org> (2022-12-05)
-# No releases since 2003 (!), upstream effectively dead, no Unicode support,
-# EAPI 6. Removal in 30 days (#884429)
-app-editors/elvis
-
-# Robin H. Johnson <robbat2@gentoo.org> (2022-12-04)
-# sys-boot/mbr-gpt was a bizzare package extremely sensitive to compiler &
-# linker changes. I don't know of any remaining consumers other than one weird
-# system I have.
-# If you're a consumer: syslinux gptmbr was the successor to this approach,
-# you'll need to replace the contents of your BIOS Boot Partition, because it's
-# not a direct 1:1 change.
-# Only upstream release in 2008. Removal in 30 days.
-sys-boot/mbr-gpt
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# ruby27-only package with no reverse dependencies.
-# Last release in 2019. Removal in 30 days.
-dev-ruby/logue
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-04)
-# Obsolete slot without reverse dependencies. Use a newer
-# public_suffix slot instead. Masked for removal in 30 days.
-dev-ruby/public_suffix:3
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-04)
-# Obsolete slot without reverse dependencies. Use a newer
-# rspec-rails slot instead. Masked for removal in 30 days.
-dev-ruby/rspec-rails:4
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-04)
-# Obsolete slot without reverse dependencies. Use a newer
-# selenium-webdriver slot instead. Masked for removal in 30 days.
-dev-ruby/selenium-webdriver:3
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# ruby27-only packages with no other reverse dependencies.
-# Last releases in 2013 and 2015. Removal in 30 days.
-dev-ruby/textpow
-dev-ruby/ultraviolet
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# Obsolete slot without reverse dependencies. Use a newer vcr
-# slot instead. Masked for removal in 30 days.
-dev-ruby/vcr:3
-
 # Sam James <sam@gentoo.org> (2022-12-03)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
 >=www-client/chromium-110
 
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# Obsolete slot without reverse dependencies. Use a newer faraday
-# slot instead. Masked for removal in 30 days.
-dev-ruby/faraday:0
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# Obsolete slot without reverse dependencies. Use a newer net-ssh
-# slot instead. Masked for removal in 30 days.
-dev-ruby/net-ssh:5
-
-# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
-# ruby27-only packages. No recent releases. No reverse dependencies
-# anymore. Maksed for removal in 30 days.
-dev-ruby/rspec-retry
-
-# Oz Tiram <oz.tiram@gmail.com> (2022-12-03)
-# Mate-desktop no longer supports gtk+:2, so there is
-# no need for this package. Removal on 2023-01-03.
-x11-themes/mate-themes-meta
-
 # Piotr Karbowski <slashbeast@gentoo.org> (2022-11-29)
 # Multiple stability issues, deadlocks on exit, broken API.
 # Bug #883559
@@ -1206,11 +1087,6 @@ dev-ml/patience_diff:0/0.15
 dev-util/patdiff:0/0.15
 =dev-ml/alcotest-1.6.0*
 
-# David Seifert <soap@gentoo.org> (2022-04-06)
-# Unsupported branches, no consumers left, removal on 2023-01-01.
-sys-devel/automake:1.13
-sys-devel/automake:1.15
-
 # Maciej Barć <xgqt@gentoo.org> (2022-02-20)
 # Masked for testing, builds and passes tests but randomly segfaults,
 # meaningless backtrace, debugging (flags, symbols) do not help
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7378e43b4173..16b953989672 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8962,7 +8962,6 @@ x11-themes/gtk-engines-murrine:animation-rtl - Progressbar animation from right
 x11-themes/gtk-engines-murrine:themes - Pull in themes via x11-themes/murrine-themes
 x11-themes/gtk-engines-nodoka:animation-rtl - Progressbar animation from right to left
 x11-themes/kfaenza:additional - Install additional KFaenza icons. See third homepage for details
-x11-themes/mate-themes-meta:gtk2-only - Allow dependency-resolution for a system without GTK+3
 x11-themes/tela-icon-theme:black - Install black folder version
 x11-themes/tela-icon-theme:blue - Install blue folder version
 x11-themes/tela-icon-theme:brown - Install bworn folder version
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 468d0be07d9b..39ac54bff71c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/acl2/Manifest b/sci-mathematics/acl2/Manifest
index 14113f3e630d..343e85d11642 100644
--- a/sci-mathematics/acl2/Manifest
+++ b/sci-mathematics/acl2/Manifest
@@ -1,4 +1,4 @@
 AUX 50acl2-gentoo.el 230 BLAKE2B 42394e3aa3c8925a09ae331c0e133ebe0eb917991301172a50630b53c80dfda75629e8bc1ae4e9f844b5ab606ffbe0ffd70778c8066f4da386f8dad10ccee7ab SHA512 8b367c76497e50284f11606e7660148b78f069fa474bfaae49de4ac9649e524da1902b61a28ea50223d53582fe76485a8c2b26ca8b698005b2dd47cadcf99828
 DIST acl2-8.5.tar.gz 222696244 BLAKE2B e5aa8360d9f94ed398d11c4e0873818f8f49ed0e072192c7d62dde99b4a7f98b4240b352818e7691ebc98f85ab3c10981c36bb1e35317e50a111c9c7f3f57b33 SHA512 5a2e004713350ae41ced830aa8620c27963eb108baa499f7e52a1c60961b220ef7a026efdfef6cea1063f731b50f3cccbe1583a9957c9cf269b0a958ec83fe48
-EBUILD acl2-8.5.ebuild 2144 BLAKE2B 5952da8e09626d4e087783cdc2311b0485d50052c4f43e8b1046ed8ad2770c38404c0246c69b397df124d0f77385882b6b819dcf6aabaea669c462dbec46af21 SHA512 fa27d6da48e6dfaa9122cc7c9429a95af08511e00dae889f45beeb7ffd071ba251d372e2f07cfe2b6984388f0a503f828d54e8e502ed880ecbf53493a6f9e6ee
+EBUILD acl2-8.5.ebuild 2145 BLAKE2B 158ce525dc96482c125961840dbabbaa3ed58ee7ac6d2ff4ca66ee5311d77a8998a2730600a0634ad6c6a509d6358d3f893671581c36ca42903ad7a04a057ab7 SHA512 0e17a95fdf409f0edfcece90cdda8d9cf06e10efd5a2dcf7e9c3a458c0b9382af819bea5cef676133327554e48fc937634b6d54c309bef26cac30a79fa2951a5
 MISC metadata.xml 816 BLAKE2B 791aff8f16b043469eb568aa6d50c2dabb2ffc3686ee846e98fd8f6e48533f5e4f86d500d8065a3a91cfce767c4990aabaf437eb97e57f8deabe19a6b9248116 SHA512 42a005fb8d3831cc422fed00a18419b959d40c3ee25a437efbfb836d9cb008fe22390a1986b090261c735fc0ff18688331ef884ee892703b166807616b947e64
diff --git a/sci-mathematics/acl2/acl2-8.5.ebuild b/sci-mathematics/acl2/acl2-8.5.ebuild
index bea58cd4e997..c681f996e4fd 100644
--- a/sci-mathematics/acl2/acl2-8.5.ebuild
+++ b/sci-mathematics/acl2/acl2-8.5.ebuild
@@ -66,7 +66,6 @@ src_install() {
 	doexe ${saved_name}
 	insinto /usr/share/acl2
 	doins ${saved_name}.core
-	doins TAGS
 	dosym -r /usr/share/acl2/${saved_name} /usr/bin/acl2
 
 	if use doc ; then
@@ -76,6 +75,7 @@ src_install() {
 		einstalldocs
 	fi
 	if use emacs ; then
+		doins TAGS
 		elisp-install ${PN}                     \
 			books/emacs/*.el{,c}                \
 			books/interface/emacs/*.el{,c}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bc6324e3e5d0..780295d386c3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
deleted file mode 100644
index 88df11db332c..000000000000
--- a/sys-apps/gpet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
-EBUILD gpet-0.4-r1.ebuild 609 BLAKE2B 6fbcf20b2165b2c7d50889763b465cb2f37bc7cd59f349298ca8939844b3ca464b0f7b4b7a6de65a4789bee1a599668041b031ab99c8c52931a50ab2941d2de7 SHA512 99f4f90bb345bee2cb683381eee49b2f84b1fbad42a8a241b922bd00361a8c4fef30256b9473222478001e4ca84117d89b0481b22f63369341cbf1c6b3739117
-MISC metadata.xml 322 BLAKE2B bcea9c595fb229b97a518a123d40d9b02a6b995a06c44ec9a919a0d5f85cf13e321f574d50b1969e022ec2ad7af9a566aeb17db8bbe243aacc903e0fd86c592e SHA512 867a9994da69716df6a8e3c4d093e3020fc5616dfe7586487ace096522041980821bd9a5f0c419254dc811e27471df240c131fa335663c7dfdf883a64c3e653b
diff --git a/sys-apps/gpet/gpet-0.4-r1.ebuild b/sys-apps/gpet/gpet-0.4-r1.ebuild
deleted file mode 100644
index 0fc96d64a9fa..000000000000
--- a/sys-apps/gpet/gpet-0.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="GTK+ based TOMOYO policy editor"
-HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"
-SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	gnome-base/gconf
-	sys-devel/gettext
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e "/^gpetdocdir =/s!doc/gpet!doc/${PF}!" Makefile.am || die
-	eautoreconf
-}
diff --git a/sys-apps/gpet/metadata.xml b/sys-apps/gpet/metadata.xml
deleted file mode 100644
index 7b667646cb4d..000000000000
--- a/sys-apps/gpet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-    <name>Naohiro Aota</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="osdn">gpet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 264e4afd3a2b..6bea51f0d2da 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/mbr-gpt/Manifest b/sys-boot/mbr-gpt/Manifest
deleted file mode 100644
index afc0d5a50821..000000000000
--- a/sys-boot/mbr-gpt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mbr-gpt_0.0.1.tar.gz 15861 BLAKE2B 00c6741fa5543af435cee97132510126d0301db2fb50712d438703165507125b4981844cb4a841b11bad075af5effb746fd3aa04e6834fb051536b250c01f7ad SHA512 eaabd84fc749ddee8fa40632ad49e15e894bf35a881fb7c35ba22796c2459a886e9bda601595e58d29567ff26959ae2befe6aec5db397d15e1dc5a292dafe165
-EBUILD mbr-gpt-0.0.1-r1.ebuild 1932 BLAKE2B 0efd6bf7919c1882c9684b10040cfd8f2e2f65062a05ca4d731aa7870e22b0f3f9fe7e428ea5e17015a0e1f6a156ec46c04a1ea6079b78d8a82d3dc51f68fc38 SHA512 9bd33644ba27a921ef98e9fe0a1128ed9c27e5069746db435d8d0cf49f62ffdee792171f72bfe470e0cda0bc38e70bad8f15626c5b78f05a5dcea1fc30ab1020
-EBUILD mbr-gpt-0.0.1-r2.ebuild 2121 BLAKE2B 4b9805ea0cf867b0b8960a0189ebe96ac38fbac1804ce7537d17ecf00997809e105ad65e610b8014a907913c42db29f9fa7f5512c7cead29596bf8f8809e59ae SHA512 da75367a3487383b62486099c04b913cc54248423dd548f4d2deab493642a98ff29684971e9193f08d1a1243d381de434d995f49b850adb36cc106edea03b2ce
-MISC metadata.xml 552 BLAKE2B 3f8022fd0857c27de45191e309a20dd123c9a0657acd400fb469ff84ecdcd15d41ef0d08570468a301865fab0cedb631a7019448843443fdea762ea145bd4e97 SHA512 88d57d384b954da1a79182e1d5294f736bc44f5ff351d47c68407e27bb366e2ac432e3b7217d2cb0547ff2e19107545a245db6d5603dbfd20254c6850af77198
diff --git a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild b/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
deleted file mode 100644
index 1b062d5e5648..000000000000
--- a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An MBR that can handle BIOS-based boot on GPT"
-MY_P="${PN}_${PV}"
-HOMEPAGE="https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-# This should probably NEVER go to stable. It's crazy advanced dangerous magic.
-# It's also pure ASM, so not suitable for elsewhere anyway.
-# Please don't remove it, robbat2 has a box that depends on it for # booting!
-KEYWORDS="~amd64 ~x86"
-
-# It only depends on binutils/gcc/make, and doesn't link against libc even.
-DEPEND=""
-RDEPEND=""
-
-# It's a mostly an MBR block and it does use the executable stack.
-QA_WX_LOAD="usr/lib/${PN}/boot.elf"
-QA_PRESTRIPPED="${QA_WX_LOAD}"
-QA_FLAGS_IGNORED="${QA_WX_LOAD}"
-
-# Don't strip it either; this binary reboots your host!
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-
-	# Messy upstream
-	emake clean
-
-	# Need to build it 32-bit for the MBR
-	# Btw, no CFLAGS are respected, it's ASM!
-	if use amd64 ; then
-		sed -i -e 's/-Wall/-Wall -m32/g' "${S}"/Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	# validate the size, it MUST fit into an MBR (440 bytes!)
-	size=$(stat --printf='%s' mbr)
-	if test $size -gt 440; then
-		die "Compiled MBR is too large! Must be at most 440 bytes, was $size"
-	fi
-}
-
-src_install() {
-	# get_libdir is not correct here. We want this to go into a 32-bit library
-	# location.
-	insinto /usr/lib/${PN}
-	doins mbr
-
-	exeinto /usr/lib/${PN}
-	exeopts -m 700
-	doexe boot.elf
-
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	einfo "See the instructions on the homepage, and make sure you know what"
-	einfo "you are doing before touching this. The mbr file does into your"
-	einfo "MBR, or alternatively you can do a creative reboot utilizing the"
-	einfo "boot.elf binary."
-}
diff --git a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r2.ebuild b/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r2.ebuild
deleted file mode 100644
index 9359c8200a24..000000000000
--- a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="An MBR that can handle BIOS-based boot on GPT"
-MY_P="${PN}_${PV}"
-HOMEPAGE="https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/"
-SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-# This should probably NEVER go to stable. It's crazy advanced dangerous magic.
-# It's also pure ASM, so not suitable for elsewhere anyway.
-# Please don't remove it, robbat2 has a box that depends on it for # booting!
-KEYWORDS="~amd64 ~x86"
-
-# It only depends on binutils/gcc/make, and doesn't link against libc even.
-DEPEND=""
-RDEPEND=""
-
-# It's a mostly an MBR block and it does use the executable stack.
-QA_WX_LOAD="usr/lib/${PN}/boot.elf"
-QA_PRESTRIPPED="${QA_WX_LOAD}"
-QA_FLAGS_IGNORED="${QA_WX_LOAD}"
-
-# Don't strip it either; this binary reboots your host!
-RESTRICT="strip"
-
-src_prepare() {
-	default
-
-	# Messy upstream
-	emake clean
-
-	# Need to build it 32-bit for the MBR
-	# Btw, no CFLAGS are respected, it's ASM!
-	#
-	# This is not meant to be used by a dynamic linker either! 
-	# https://inbox.sourceware.org/binutils/20200222023739.GB5570@bubble.grove.modra.org/T/#u
-	# Shows the --no-dynamic-linker option to ld
-	sed -i -e 's/-Wall/-Wall -m32 -Wl,--no-dynamic-linker/g' "${S}"/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	# validate the size, it MUST fit into an MBR (440 bytes!)
-	size=$(stat --printf='%s' mbr)
-	if test $size -gt 440; then
-		die "Compiled MBR is too large! Must be at most 440 bytes, was $size"
-	fi
-}
-
-src_install() {
-	# get_libdir is not correct here. We want this to go into a 32-bit library
-	# location.
-	insinto /usr/lib/${PN}
-	doins mbr
-
-	exeinto /usr/lib/${PN}
-	exeopts -m 700
-	doexe boot.elf
-
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	einfo "See the instructions on the homepage, and make sure you know what"
-	einfo "you are doing before touching this. The mbr file does into your"
-	einfo "MBR, or alternatively you can do a creative reboot utilizing the"
-	einfo "boot.elf binary."
-}
diff --git a/sys-boot/mbr-gpt/metadata.xml b/sys-boot/mbr-gpt/metadata.xml
deleted file mode 100644
index 43abbb35dc1e..000000000000
--- a/sys-boot/mbr-gpt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-	Bootable MBR including fake partition records, for legacy BIOS without any GPT support, and usable without hybrid disk layouts.
-	Install directly at the start of a disk, create GPT, ensure at least one partition has GUID set to BIOS Boot Partition (21686148-6449-6e6f-744e-656564454649).
-</longdescription>
-</pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f3da33281248..e894b4009730 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 7b8f51522c55..4c9f94335e1b 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -9,12 +9,8 @@ AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
-DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
-DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r3.ebuild 2572 BLAKE2B 378123d8b34874e9838ce279363cb9ee3c3e1b4e45335dd8016499809b1c550996943f0e4c46932294a2cfea06eb71bccb9ee6476078eaba2ca3d53a762876d1 SHA512 808f016c339714b8be0745d64e90236ecf91e8ce855aa9d31b1ec8a95906d45c57de512f7d114629584731d08ea537bcca38587ed4bdf6e70562a5b5954cf39e
-EBUILD automake-1.13.4-r2.ebuild 2649 BLAKE2B 22a96d73d5b538b18b69321db59141f3c57c9c44f7756090dc21ccb88a115354bacaa47bb6b8c89214fbe07aeabf814e38efd29a612041b8c954986811d9d2b6 SHA512 6a60d26635e18199ee36672aa1e5e07acd0692f15b79d0c8c90032b376b0967f79ba93679692e9e145dc95857b5fab5507c4d7d1cd19a84a8facdb4c38bf99d6
-EBUILD automake-1.15.1-r2.ebuild 3198 BLAKE2B 1df7f839f56b10a1d01c9e9926a426b8b50258e93276a8cf341e7105946fdd8dbb0172f771d5b34f7baa7882dec0803b7efb1ecb421b425ad2bfff62d99e7b62 SHA512 3885cc741e3d959a19320d745ff072e9a9aecc1abde481ddee342f24387c2b5d6de9f74486a179d2f7014d32c047395fef8495b39a2bd7e5ceab4afa6589d08f
 EBUILD automake-1.16.5.ebuild 3541 BLAKE2B 545b10470dbf067f06b05e48e8f21b89c280dbad7c80d0820b59cf7f2b20821c9f3d3e41f6200faf83e83af9d3dccf1fd40b603d3f5db90cb977484369ca1c33 SHA512 c549e7609f218bde08ecd8897c637bc751de764a20fd7e96398b5ff4c314b7848f808eb6dedacb9a700548594250d5909eb41d3cc6abd8af840c261616c290be
 EBUILD automake-9999.ebuild 3347 BLAKE2B 4dbc55dca89d555fc2a313bfce7a98aeb0cdfc882ae45f61eca311bdc205797bf486fcae3520aa3f52de73bdf5c2c58de6f467ea13f07fafb964b44d24515f16 SHA512 74a040fdc14461be096f8a865c37f6686cae80d7cd5a2f426efb731e17595c1c4f1ab6a6d5f0bcccd97b2bcf763ff334586659c44b3dd5fe5c710edfc87590f3
 MISC metadata.xml 332 BLAKE2B d33ce6b379d5d8d44ae9104f3e5c5a0b5b25682072f7222bdd6dd92b97123b3cc011ed078178a8d2cb9e3e3d1da03dde67b3a844374819fdb67b879341a8a5fa SHA512 ad4477b610e680468526c77df5550b44f8d0558237aac887312a463d4da29216a63db372710398d0eb478550550507e81421d1deee272038b3658c38b84e5b06
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
deleted file mode 100644
index 520ca9e3dae5..000000000000
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0: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"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
-	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
-	"${FILESDIR}"/${PN}-1.13-hash-order-workaround.patch
-	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
-)
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
deleted file mode 100644
index fcc66ddf352f..000000000000
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	else
-		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/perl-5.6
-	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-BDEPEND="app-arch/gzip"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
-	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap || die
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index e7c03ae0c230..417afff139fa 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,11 +1,7 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 AUX bmake-20220418-warnings.patch 1304 BLAKE2B 364c458c39541f5901a7e46c2275625972d1879d42fd9c5f347e2f27f3b6f837dc3c1f676b3da1615eab6f91f38766bfc758d58959313e5598c4c9a7445fb93e SHA512 3925f5feea2222bd0b136f41dc633e03254946a88ef6029e4363f2bbcf97214f25479d27489a8f1697ddca5bab4157fb7675aba81534bcfa35eaa16750ce098b
-DIST bmake-20220901.tar.gz 816362 BLAKE2B f2faf7ee44a83ba340a9682756e8ba3371ce2c6b4712331b666e01b00a483ae79f68b34ae62325ef55eea0ea42d0c23e1e654100913b65ecd607a78cc2cfa1ae SHA512 af8ee6ef896b76c14f63d24eaadd01e87abf2b12db69f334d29c811d69d1479f899d5aa0aadf2e6e87659175d64066bb90f2056b649141fcad20eac7d6057019
-DIST bmake-20220924.tar.gz 820164 BLAKE2B 5f74403ec68d9512ed74972b74219aa647b4c0ea855bd80fbf251f40a785c02f807c5cac0c7704469d343e43c5b84c395d3c1aab8ea3c8695314f016f1fa57c7 SHA512 85fa9e05a6020e7b41ef6af4b5a8f87f1f98651e264ba8cedacacf3b7d1dfbed3f66bb9934c252f71299aea6ac1190b03a9de0c60a833e8ac91ec854cd819f7b
 DIST bmake-20220928.tar.gz 821224 BLAKE2B 9b377a9a8d329d229aae37fd852a68629edb78f7f0f16bf8aeb59df4da886fe89d8b7defd8294fa49fca397d4726e704eb9c95936561fe8a3a0a1fdfe4e5b861 SHA512 13fde6517d79080c5a548b1e47e4fbf00d54752f48b40d10542926b26a3be22da70877ca2b977b43366ec1b632a76a6974c78155c39895910e01e4142e7675a0
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20220901.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
-EBUILD bmake-20220924.ebuild 1319 BLAKE2B 481e1222949a47890a40d0f88678ecb2188a56dfaa2b25b6a1df7c772ce6e0ce01369919fee921f3b39bfafe7c39357afdb859d19512227df0d837cfe7aac5e7 SHA512 cc5a8f0d3673ca8516e1cf57f458c34ad26827c1c57810a084432cfcd91783094b9bb2bcec2c5d4d4f7a9ff2b816abd0794e2b130c15dd9792562c008501d960
-EBUILD bmake-20220928.ebuild 1281 BLAKE2B 815bf97b85dc5b9af274a6d7d2245c0e7c02d4a31018bd009696a328068c7dc373fa88f9d213752c4a542c6c38ca836e206c447a13d8db83366b142ad6f679d3 SHA512 824259ba786e879d43cd6d25c1411d4161bda9ba821d5421b5539854c8043fd25bc91ff315a9d22b451e4daecc2b537b84e2ef310616e600274c1f02cf4378f5
+EBUILD bmake-20220928.ebuild 1280 BLAKE2B 8b0a901f552c84562690e3543e66cb388b9a3415ecc83028748711982651b91e75fca5f6e4fbff17b5db3ec52447e9f03b56589ff991e41be979a1026f221389 SHA512 99320a95fc86b80d9449be59e98acaab416c69209528ed0110b00e1fe18b8739a5e8100c8f4a8bb302c6e1ea4f7930253ea5cf69861f5172b02fa987d3bd2f97
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220901.ebuild b/sys-devel/bmake/bmake-20220901.ebuild
deleted file mode 100644
index 7e0fdf7ced79..000000000000
--- a/sys-devel/bmake/bmake-20220901.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MK_VER=20210330
-
-DESCRIPTION="NetBSD's portable make"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
-SRC_URI="
-	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
-	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-# Skip failing test (sandbox and csh)
-PATCHES=(
-	"${FILESDIR}"/${PN}-20210206-tests.patch
-	"${FILESDIR}"/${PN}-20220418-warnings.patch
-)
-
-src_prepare() {
-	default
-	cd "${WORKDIR}" || die
-	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
-}
-
-src_configure() {
-	econf \
-		--with-mksrc=../mk \
-		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
-		--with-machine_arch=${ARCH}
-}
-
-src_compile() {
-	sh make-bootstrap.sh || die "bootstrap failed"
-}
-
-src_test() {
-	cd unit-tests || die
-
-	# the 'ternary' test uses ${A} internally, which
-	# conflicts with Gentoo's ${A}, hence unset it for
-	# the tests temporarily.
-	env -u A MAKEFLAGS= \
-		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	FORCE_BSD_MK=1 SYS_MK_DIR=. \
-		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
-		|| die "failed to install mk files"
-}
diff --git a/sys-devel/bmake/bmake-20220924.ebuild b/sys-devel/bmake/bmake-20220924.ebuild
deleted file mode 100644
index 2a19a8be21df..000000000000
--- a/sys-devel/bmake/bmake-20220924.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MK_VER=20210330
-
-DESCRIPTION="NetBSD's portable make"
-HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
-SRC_URI="
-	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
-	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Skip failing test (sandbox and csh)
-PATCHES=(
-	"${FILESDIR}"/${PN}-20210206-tests.patch
-	"${FILESDIR}"/${PN}-20220418-warnings.patch
-)
-
-src_prepare() {
-	default
-	cd "${WORKDIR}" || die
-	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
-}
-
-src_configure() {
-	econf \
-		--with-mksrc=../mk \
-		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
-		--with-machine_arch=${ARCH}
-}
-
-src_compile() {
-	sh make-bootstrap.sh || die "bootstrap failed"
-}
-
-src_test() {
-	cd unit-tests || die
-
-	# the 'ternary' test uses ${A} internally, which
-	# conflicts with Gentoo's ${A}, hence unset it for
-	# the tests temporarily.
-	env -u A MAKEFLAGS= \
-		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	FORCE_BSD_MK=1 SYS_MK_DIR=. \
-		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
-		|| die "failed to install mk files"
-}
diff --git a/sys-devel/bmake/bmake-20220928.ebuild b/sys-devel/bmake/bmake-20220928.ebuild
index 2015f0528d5a..15621472a9d8 100644
--- a/sys-devel/bmake/bmake-20220928.ebuild
+++ b/sys-devel/bmake/bmake-20220928.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~loong ~ppc ~ppc64 ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0b519859e860..91c6a06fb6c9 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -16,7 +16,7 @@ EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f9
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
 EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 5183c85d6e303ec5dae02e2dab25405b2220b3cc2d1236f0335002a9ca152f2980109a20cd3851ff2ca87225926c7da757dd5602cc6ce57c96b04f81da415ffc SHA512 7273c4de97260b85553664b39bab009215904aba985cb9d0608387aeff093e6c9200ec864fa55079ca09b811112a66b8aae7ed9dda0a40466610eba66f01bba5
 EBUILD clang-15.0.6.9999.ebuild 11887 BLAKE2B 54096f168b831260dd077223240e581562d0f85f2b251108b222e2e44926a67688d0aa7cf3e2ae301691f89e72219f9a61d87ae22c06e8cfbc69625a28a2f967 SHA512 c02594b7a0be16c064fc411ada88330ee124912effd732e7d0d8a5bd6bd8b0a51619ec7a73715f8cd17434dfd4d66c692449b95b70312b6b2386e5548db04307
-EBUILD clang-16.0.0.9999.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
-EBUILD clang-16.0.0_pre20230101.ebuild 11809 BLAKE2B 5831fc1c041b44c40e628757c3381854ef96d3f4ccab623616b2838bf0b57e91a7846ddd511c8cd44517497e2189535c7e80a518bb80b1e977e200adfd95195d SHA512 ca56f1fbc06cae0aaa2916921ec37c9244e3365d57317be556ce94e3d76d1f50a0aae119a533a1619db995aed304ce660ceeebca3fc733f70a8066484674790d
-EBUILD clang-16.0.0_pre20230107.ebuild 11803 BLAKE2B 40e291b238494fae47021adc6ad7cc05c3b66d22d191b3aa3d52b29f1018d4ba32a5f5393b9ee19be581062259b3812be7b4ab553d12cf11e69df472f31664fc SHA512 896119e9df24cff2f80197320b7ac213dd2c03324a2ee1f629ba82ac9d20c61514b1ca708b58c6a9a7534d7b6b7197952df7ee7bc06eda2f1341c1478edb90a6
+EBUILD clang-16.0.0.9999.ebuild 11882 BLAKE2B 1a9a7c092963b17e51a1253119d748edc38d39c4ab5215d4762d8e13b37ab10f4f2043df8926a436cbc0c85814e95fb4b409ca3bbec0881defab66c204e4c3c7 SHA512 f16ca7ba1822f32b3a1a07da05d140a88d4b344ccd029a6a78c92c9af4bbdfd92ba22022d25101a5f4d649679be703bdde9c5e97e552a59dadd40b2fa8b4530b
+EBUILD clang-16.0.0_pre20230101.ebuild 11888 BLAKE2B bfa7c91e90034714f5ac42ec29c8fa6bfcb82c06bf92a15e374b483089e629d0261d18ea1c66356efed270a28c46aba27a48b98866721aef033c7ae174f4ec8e SHA512 8565434cd90020a51331ca8716a1a65a52a09bb0fed0fa7934600b548ee8cf03fdeef32ddcdee9c6c3b8096f11335674c2e6632354f41c80887a4b8b89c807f3
+EBUILD clang-16.0.0_pre20230107.ebuild 11882 BLAKE2B 1a9a7c092963b17e51a1253119d748edc38d39c4ab5215d4762d8e13b37ab10f4f2043df8926a436cbc0c85814e95fb4b409ca3bbec0881defab66c204e4c3c7 SHA512 f16ca7ba1822f32b3a1a07da05d140a88d4b344ccd029a6a78c92c9af4bbdfd92ba22022d25101a5f4d649679be703bdde9c5e97e552a59dadd40b2fa8b4530b
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
index 34eba8f9bc95..b3eeacb43e1d 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi
 
diff --git a/sys-devel/clang/clang-16.0.0_pre20230101.ebuild b/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
index 1ffc67b58c67..15f87c70e26c 100644
--- a/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20230101.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi
 
diff --git a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
index 34eba8f9bc95..b3eeacb43e1d 100644
--- a/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
+++ b/sys-devel/clang/clang-16.0.0_pre20230107.ebuild
@@ -331,8 +331,10 @@ multilib_src_configure() {
 	if tc-is-cross-compiler; then
 		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
 			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
 		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${BROOT}"/usr/lib/llvm/${LLVM_MAJOR}/bin
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
 		)
 	fi
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9806a29430b1..60584300ce40 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 29b79fd4089d..370ecb7a19da 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -2,5 +2,5 @@ AUX mtd-utils-2.1.4-glibc-2.36.patch 537 BLAKE2B 14788f3b435c2e4bbb01afed7ce4122
 DIST mtd-utils-2.1.4.tar.bz2 630365 BLAKE2B 0538ecb90cd1215662cc8493d07e743e067218c1ae1ce09f40343a1ab13f5318d5e198d622a0d69acb2d677cdd3415880689c42afa41877730ff6a546c2b318f SHA512 4010a7b25cf32df2de02b8efbbe91c49789e3963618df7461e4bf64a8c588440c55f17c750a7d2df34367a732b0fefc487ee052129a5aa6a44a0023b714dface
 DIST mtd-utils-2.1.5.tar.bz2 640309 BLAKE2B 94dfd37c10d2759c2fe0b2a7565e2a2aeafdfcaaba2ab9eddc5de2d77658f2702f25004609698585c170839f4e4b685e99004918f1e20cf1ced6925680215427 SHA512 625ee12baf38401c60f6c22d53ed649710417f8d03c6c2217cee890478954e22261428fbf11c713493fb6b7d452ed5af44b0dc9c58133f7b4f52e369353a62c3
 EBUILD mtd-utils-2.1.4-r1.ebuild 952 BLAKE2B 1e7b02e02626649558ef5ce65aab0453cf0c62676b4968b0393a25ffeda3fac89567d0349683304970ffaf747bad7ae00258da449f4ba91f214b857acaf08533 SHA512 7d907aba023347f6eb80b47185cbcf588fee44829b3f0a8b1adc387a624616a3a723a0e6abfcad1abae57802db3358be8a67408c976279c109f8c71f1a40d671
-EBUILD mtd-utils-2.1.5.ebuild 959 BLAKE2B 2eaf9d7c66a0a247db806725d6e22b62310747e4c676283c6034d356d0e2c84385fd079b5a2d8f400af69b2dfa32f4007847ec3541e735cec2268e075687931a SHA512 e21dcfb2bf49cd9a5fda625c8a2f44aa89fe91863654d00f052ebdc200dcea320c05b7176b1f7d5c64d021351eb0554c7b436475e74840553e4fbf248a034abc
+EBUILD mtd-utils-2.1.5.ebuild 955 BLAKE2B d38fc5837da676ba445bb4a226c63bcbf464f8a46dae2b38e1f6d00caa9b60508193949a600afe3f163042956347787ca9fd20c71a91e48bd77a058a366cf865 SHA512 b8b2c1cde8ab0d0e2e6d96245548f570fc5e0d21d7017d2a46c6d5bff686e00da88560d951f9e57a242aa8f649abced7e88737ddeb787387e4ae6f70be28b53f
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
index 2a257eabb439..bd03490d855f 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -9,7 +9,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 362820dbabe0..5dfd3c130e2f 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index df79ccfc45a7..a4dbd6b661af 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -10,18 +10,10 @@ AUX db-6.0.20-test-link.patch 1395 BLAKE2B 639f40b16fd225a57825387d75ac8bd961b11
 AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb7830dea3da6b60a05c9be6e5e5169dd9ee7b2e032b4ba9669d8de3985a2717101f7b709e1c26efb5a3200d1aa0d6511bed5d16 SHA512 fd8a4eed5d54f3364c5d3509a238db1f1d62b3f13b75ba1e58a20659c83d038904562d32cc4cdde41b324623459e50071b507979b3fedbc85f2231e6784f1227
 AUX db-6.1.19-sqlite-configure-path.patch 711 BLAKE2B d00fe596fe422f152889fe0285a5b00d2fd0724a9406f27ef904cc533c0197c6ad340946256cf0ccc388b7126c61bcdbc37921c84028e742201d952c1f2e1df6 SHA512 d79c2520c75d0f96049e0b7ffa168de5aaee9050927d8b1ffaa5a4a7fc64b75654906f182e7aa5e0a33d55402655b2d10981849f15cf6b4bec5c6feb080de1c5
 AUX db-6.2.38-bashism-configure.patch 425 BLAKE2B 68e67fd52ffc11cdc23b8e19954b34a320faad8f001bb4282464caf48a5911f58db1824cd8f2803968f3b4b31084999b8b04967cd917111b099ec2d43138dd44 SHA512 b6c5e44055d2d763ddef12f48a030693deb0addd9b72f63896a9c9bf61a4ad243b0c663b3f8d60a84b5dddaea6b7fbb76f0bc9de53065b030a3431a59facc8c3
-DIST db-18.1.32.tar.gz 44244747 BLAKE2B b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e SHA512 890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25
-DIST db-18.1.40.tar.gz 30763705 BLAKE2B c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd SHA512 53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e
 DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
-DIST db-6.1.38.tar.gz 37644337 BLAKE2B 32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c81eeee32c472c46d31c17693519959ff03 SHA512 5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0b3333d617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
-DIST db-6.2.38.tar.gz 41298311 BLAKE2B a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297 SHA512 b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19
-EBUILD db-18.1.32-r1.ebuild 5960 BLAKE2B 0c5376bf33a91c69c3f0bfe3baf9b4f99770082ebbbf202ac436a9a1b9d8f9ce8e59f8e2670c0a524848717e98991cbb0e628098d060af99cead9fa5ef82a632 SHA512 3f5dca955df5d78f95baaeb2f64ae30e67f7ee30656e962ccd119f8a88d45905fecbdf5d29a2e72b5e63c41ef849db6961b22b86cc03aa132a0114fc00310d61
-EBUILD db-18.1.40-r1.ebuild 5877 BLAKE2B 225c7e6250140cc1c8c81f0b99a326e5b3ea0007b5b8804155b45e4b3c82fe09bb704590379098789ea43a657d0e72e79b1bd2e0c0dfd69c4615685010939d51 SHA512 6d9052607d2bf864d3ded422054b55a387c7cbc17f2575c879b7333be22b57507f186598f4107167a914dee7594c0a98d5e1628aba40a2c3269dc95ef0b73905
 EBUILD db-4.8.30-r7.ebuild 4342 BLAKE2B 22ad7bd25d04d82613977abda9f58c6d1c6fcde6f1124324240848e27746405d03477757e680cb757b5aa50cde68deef60f2adcf032683f0939c6c3a4ed9926a SHA512 336b22c0d8947ef64f57f29b5783a8d719c09d6aafc42dfb28be289f9112fbdf378b3694a26fc97479619edab9a255159d9134fe1ca3c9fa210f8363dd642d1d
 EBUILD db-5.3.28-r8.ebuild 6332 BLAKE2B 20716e56c762093c140f9e33306ea7a131fa9aa4de97b873f1ef3e1998b698502926948c7e3ee6483645cae3a82682a54b7655db72bbb368dd762a7fe5a9eb91 SHA512 95d286e2ca2196703db123afb2c9f4bd2d9fe1f8170b3005ab23e086d8af2651a241ad15dab13e13f4ebb00a232d251210624c9156a7c699d687beea1b6455c8
 EBUILD db-6.0.35-r4.ebuild 6228 BLAKE2B 6c533595bbe2d1888c296eabaae5eb40f1335c81a76d1d95a3b4bbd2123abc673dee0e08e90c323ab7a59c95ab8890da483aa53cec93c92079000021e4d943b9 SHA512 18497321dd41cd1025c2e9ebffae12a0e0acb70843dd73c7db668bca86d31246cd3e60ceebfb1d06367061a47e8cbde3fa51053c67917000d567d1c4d663541f
-EBUILD db-6.1.38-r1.ebuild 5972 BLAKE2B 38eae142baf4c6ec125a47122152c91784d4966f76cdbccc47bd1b45589427f81fdee9885c5cd7cc22314bd7568c49cb418f92c20ad30fdee467b20de094ab04 SHA512 87f8b07c235de5e19b39abd2c274f9d84084c0c7d73bb3db545b41ba4b19d93c0de9a0be5d601f087d3f8d6429bceed36567fbc6f4ec989be07fcf084cd829e9
-EBUILD db-6.2.38-r1.ebuild 6235 BLAKE2B 852bcc42f266a6a3285197dabdd1b75a07399ab27a937e3367a9a9e414d80d0f87573a81c654ac7d169903da17bdf38af412331c51520924f9e71125b43026d5 SHA512 a2f18cecb29111c7aaccf976ffec22f1567235540b72f1c61250d2d650f7e1f539ba001e1fff77d70ad7eb1cb0a00f674d842955c460c3dc02bdab072eea7969
 MISC metadata.xml 1261 BLAKE2B 81cfdd965f4e2e0342d812c6c1fd602c43ca8bbbb23bd12f230444d26bee578f9ba2af781a8390bb754b66b4699c6aada379dea90397798f8a489a7fd11b85fb SHA512 08d43450d54a8718639ae2637f13da7626415e99a8fa5948c5107b7a973161f31b3b0cf58dc538dd48a18db996f020d57d20edefbcdd8e37c6e58c206c3aab6e
diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild
deleted file mode 100644
index 463c37170918..000000000000
--- a/sys-libs/db/db-18.1.32-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-RESTRICT="!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/dist"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(ver_cut 1-2)/db.h
-)
-
-PATCHES=(
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-18.1.25-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-18.1.25-test-link.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	default
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal" eautoreconf
-	# Upstream sucks - they do autoconf and THEN replace the version variables.
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	local myeconfargs=(
-		--enable-compat185
-		--enable-dbm
-		--enable-o_direct
-		# Requires openssl-1.0
-		--with-repmgr-ssl=no
-		--without-uniquename
-		--disable-sql
-		--disable-sql_codegen
-		--disable-sql_compat
-		--disable-java
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-		$(use_enable cxx)
-		$(use_enable cxx stl)
-		$(use_enable test)
-	)
-
-	tc-ld-force-bfd #470634 #729510
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	append-ldflags -Wl,--default-symver
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myeconfargs+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myeconfargs+=(--disable-tcl )
-	fi
-
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED%/}"/usr/bin/berkeley_db_svc \
-			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild
deleted file mode 100644
index 7809ee145998..000000000000
--- a/sys-libs/db/db-18.1.40-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-RESTRICT="fetch
-	!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/dist"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="https://download.oracle.com/otn/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(ver_cut 1-2)/db.h
-)
-
-PATCHES=(
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-18.1.25-test-link.patch
-
-	"${FILESDIR}"/${PN}-18.1.40-fix-docs.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	default
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal" eautoreconf
-	# They do autoconf and THEN replace the version variables :(
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	local myeconfargs=(
-		--enable-compat185
-		--enable-dbm
-		--enable-o_direct
-		# Requires openssl-1.0
-		--with-repmgr-ssl=no
-		--without-uniquename
-		--disable-sql
-		--disable-sql_codegen
-		--disable-sql_compat
-		--disable-java
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-		$(use_enable cxx)
-		$(use_enable cxx stl)
-		$(use_enable test)
-	)
-
-	tc-ld-force-bfd #470634 #729510
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	append-ldflags -Wl,--default-symver
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myeconfargs+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myeconfargs+=(--disable-tcl )
-	fi
-
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED%/}"/usr/bin/berkeley_db_svc \
-			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild
deleted file mode 100644
index 9e4cdf7d678a..000000000000
--- a/sys-libs/db/db-6.1.38-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-RESTRICT="!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(ver_cut 1-2)/db.h
-)
-
-PATCHES=(
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	default
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal" eautoreconf
-	# They do autoconf and THEN replace the version variables :(
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	local myeconfargs=(
-		--enable-compat185
-		--enable-dbm
-		--enable-o_direct
-		--without-uniquename
-		--disable-sql
-		--disable-sql_codegen
-		--disable-sql_compat
-		--disable-static
-		--disable-java
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-		$(use_enable cxx)
-		$(use_enable cxx stl)
-		$(use_enable test)
-	)
-
-	tc-ld-force-bfd #470634 #729510
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	append-ldflags -Wl,--default-symver
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myeconfargs+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myeconfargs+=(--disable-tcl )
-	fi
-
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED%/}"/usr/bin/berkeley_db_svc \
-			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-
-	# no static libraries
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild
deleted file mode 100644
index 846d8741b73d..000000000000
--- a/sys-libs/db/db-6.2.38-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [[ ${PATCHNO} == "${PV}" ]] ; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-RESTRICT="!test? ( test )"
-
-S_BASE="${WORKDIR}/${MY_P}"
-S="${S_BASE}/build_unix"
-DESCRIPTION="Oracle Berkeley DB"
-HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
-for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="AGPL-3"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc cxx tcl test"
-
-REQUIRED_USE="test? ( tcl )"
-
-# the entire testsuite needs the TCL functionality
-DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
-	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
-RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/db$(ver_cut 1-2)/db.h
-)
-
-PATCHES=(
-	# sqlite configure call has an extra leading ..
-	# upstreamed:5.2.36, missing in 5.3.x/6.x
-	# still needs to be patched in 6.0.20
-	"${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
-
-	# The upstream testsuite copies .lib and the binaries for each parallel test
-	# core, ~300MB each. This patch uses links instead, saves a lot of space.
-	"${FILESDIR}"/${PN}-6.0.20-test-link.patch
-
-	"${FILESDIR}"/${PN}-6.2.38-bashism-configure.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/"${MY_P}"
-	for (( i=1 ; i<=${PATCHNO} ; i++ ))
-	do
-		eapply "${DISTDIR}"/patch."${MY_PV}"."${i}"
-	done
-
-	default
-
-	# Upstream release script grabs the dates when the script was run, so lets
-	# end-run them to keep the date the same.
-	export REAL_DB_RELEASE_DATE="$(awk \
-		'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
-		"${S_BASE}"/dist/configure)"
-	sed -r -i \
-		-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
-		"${S_BASE}"/dist/RELEASE || die
-
-	cd "${S_BASE}"/dist || die
-	rm -f aclocal/libtool.m4
-	sed -i \
-		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-		configure.ac || die
-	sed -i \
-		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-		aclocal/programs.m4 || die
-	AT_M4DIR="aclocal" eautoreconf
-	# They do autoconf and THEN replace the version variables :(
-	. ./RELEASE
-	for v in \
-		DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
-		DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
-		DB_VERSION \
-		DB_RELEASE_DATE ; do
-		local ev="__EDIT_${v}__"
-		sed -i -e "s/${ev}/${!v}/g" configure || die
-	done
-
-	# This is a false positive skip in the tests as the test-reviewer code
-	# looks for 'Skipping\s'
-	sed -i \
-		-e '/db_repsite/s,Skipping:,Skipping,g' \
-		"${S_BASE}"/test/tcl/reputils.tcl || die
-}
-
-multilib_src_configure() {
-	# sql_compat will cause a collision with sqlite3
-	# --enable-sql_compat
-	# Don't --enable-sql* because we don't want to use bundled sqlite.
-	# See Gentoo bug #605688
-	local myeconfargs=(
-		--enable-compat185
-		--enable-dbm
-		--enable-o_direct
-		--without-uniquename
-		--disable-sql
-		--disable-sql_codegen
-		--disable-sql_compat
-		--disable-static
-		--disable-java
-		$([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly)
-		$([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly)
-		$(use_enable cxx)
-		$(use_enable cxx stl)
-		$(use_enable test)
-	)
-
-	tc-ld-force-bfd #470634 #729510
-
-	# compilation with -O0 fails on amd64, see bug #171231
-	if [[ ${ABI} == amd64 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O0 -O2
-		is-flagq -O[s123] || append-flags -O2
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use kernel_linux || use kernel_SunOS; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	# Bug #270851: test needs TCL support
-	if use tcl || use test ; then
-		myeconfargs+=(
-			--enable-tcl
-			--with-tcl="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		myeconfargs+=(--disable-tcl )
-	fi
-
-	ECONF_SOURCE="${S_BASE}"/dist \
-	STRIP="true" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	db_src_install_headerslot
-
-	db_src_install_usrlibcleanup
-}
-
-multilib_src_install_all() {
-	db_src_install_usrbinslot
-
-	db_src_install_doc
-
-	dodir /usr/sbin
-	# This file is not always built, and no longer exists as of db-4.8
-	if [[ -f "${ED%/}"/usr/bin/berkeley_db_svc ]] ; then
-		mv "${ED%/}"/usr/bin/berkeley_db_svc \
-			"${ED%/}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
-	fi
-
-	# no static libraries
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	multilib_foreach_abi db_fix_so
-}
-
-pkg_postrm() {
-	multilib_foreach_abi db_fix_so
-}
-
-src_test() {
-	# db_repsite is impossible to build, as upstream strips those sources.
-	# db_repsite is used directly in the setup_site_prog,
-	# setup_site_prog is called from open_site_prog
-	# which is called only from tests in the multi_repmgr group.
-	#sed -ri \
-	#	-e '/set subs/s,multi_repmgr,,g' \
-	#	"${S_BASE}/test/testparams.tcl"
-	sed -ri \
-		-e '/multi_repmgr/d' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	# This is the only failure in 5.2.28 so far, and looks like a false positive.
-	# Repmgr018 (btree): Test of repmgr stats.
-	#     Repmgr018.a: Start a master.
-	#     Repmgr018.b: Start a client.
-	#     Repmgr018.c: Run some transactions at master.
-	#         Rep_test: btree 20 key/data pairs starting at 0
-	#         Rep_test.a: put/get loop
-	# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
-	sed -ri \
-		-e '/set parms.*repmgr018/d' \
-		-e 's/repmgr018//g' \
-		"${S_BASE}/test/tcl/test.tcl" || die
-
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	multilib_is_native_abi || return
-
-	S=${BUILD_DIR} db_src_test
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 0e566722f2a4..2ac1bcc2ee59 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/mate-themes-meta/Manifest b/x11-themes/mate-themes-meta/Manifest
deleted file mode 100644
index 50075347084b..000000000000
--- a/x11-themes/mate-themes-meta/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD mate-themes-meta-3-r3.ebuild 516 BLAKE2B b46417320915bfc54538624768fafa24d01ef6c6093719fabbd366f1298f472c194fbf8abf9bb5d7517fc195ed5cbdf288c62b6bb1683668a99d3045b169c137 SHA512 c5890695ec1bf9d638b5d1d95d0c24ee29e8eb00620dd3061795a4a3db0b92a766c73eb177b181eea39ca26024fa14970e11aab660542fc8b9c952342cbf18cd
-MISC metadata.xml 354 BLAKE2B a4019ab3f7da3776fc9261263e20f23980d4a5a89d9cc50a903df77deb41a09e4011c9021048df38024672a6eb1725f40da02ba39e0239d8859a245783dadb5d SHA512 95ffb55b75e4efa77fa3f66877865fcd026b1ecb79d41cf535e8f7d0f7e17f761ff251be83c9fdfb7b6d599e80ea234630aebe6d54c6a157521e69d217aa2f4f
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
deleted file mode 100644
index 5d62ba3e1579..000000000000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3-r3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:MATE"
-SRC_URI=""
-
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-LICENSE="metapackage"
-SLOT="0"
-IUSE="gtk2-only"
-
-DEPEND=""
-RDEPEND="|| (
-		gtk2-only? (
-			!!x11-libs/gtk+:3
-			x11-themes/mate-themes:0
-		)
-		(
-			>=x11-libs/gtk+-3.22:3
-			>=x11-themes/mate-themes-3.22.18
-		)
-	)"
diff --git a/x11-themes/mate-themes-meta/metadata.xml b/x11-themes/mate-themes-meta/metadata.xml
deleted file mode 100644
index 9022912afeb3..000000000000
--- a/x11-themes/mate-themes-meta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mate@gentoo.org</email>
-		<name>Gentoo MATE Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="gtk2-only">Allow dependency-resolution for a system without GTK+3</flag>
-	</use>
-</pkgmetadata>
author	V3n3RiX <venerix@koprulu.sector>	2023-01-08 18:16:35 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-08 18:16:35 +0000
commit	2237cda0c6b012952e02ec1314e1f48eddf4dab7 (patch)
tree	0a7ab76265dc441f4b3436f07d019007e6a13237
parent	6a57f9ee53dc794f3d47ea68f78d6ef76d00af47 (diff)